From 18bcac151efb74e42c3efc792703c84455a92622 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 7 May 2020 11:08:09 +0200
Subject: [PATCH 01/74] bootstrap markup

---
 src/bda/plone/shop/browser/buyable.pt | 167 ++++++++++++++------------
 1 file changed, 90 insertions(+), 77 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index 9db6eba7..66f4c07f 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -25,102 +25,115 @@
     </div>
   </tal:info>
 
-  <dl class="details ${python:'with-comment' if view.comment_enabled else 'without-comment'}">
+  <div class="form-row details ${python:'with-comment' if view.comment_enabled else 'without-comment'}">
     <tal:info condition="view/can_view_buyable_info">
+    <div class="form-group form-inline col-md">
+      <div class="input-group">
+        <tal:net condition="not:view/display_gross"
+                define="price_original view/item_net_original;
+                        price view/item_net">
+          <span class="price" i18n:translate="price">Price</span>
+          <span class="price original"
+              tal:condition="python:view.not_eq(price_original, price)">
+            <span tal:replace="python:'%0.2f' % price_original">1.00</span>
+            <span tal:replace="view/currency">EUR</span>
+          </span>
+          <span class="price discount">
+            <span tal:replace="python:'%0.2f' % view.item_net">1.00</span>
+            <span tal:replace="view/currency">EUR</span>
+            (<span i18n:translate="net">Net</span>)
+          </span>
+        </tal:net>
 
-      <tal:net condition="not:view/display_gross"
-               define="price_original view/item_net_original;
-                       price view/item_net">
-        <dt class="price" i18n:translate="price">Price</dt>
-        <dd class="price original"
-            tal:condition="python:view.not_eq(price_original, price)">
-          <span tal:replace="python:'%0.2f' % price_original">1.00</span>
-          <span tal:replace="view/currency">EUR</span>
-        </dd>
-        <dd class="price discount">
-          <span tal:replace="python:'%0.2f' % view.item_net">1.00</span>
-          <span tal:replace="view/currency">EUR</span>
-          (<span i18n:translate="net">Net</span>)
-        </dd>
-      </tal:net>
-
-      <tal:gross condition="view/display_gross"
-               define="price_original view/item_gross_original;
-                       price view/item_gross">
-        <dt class="price" i18n:translate="price">Price</dt>
-        <dd class="price original"
-            tal:condition="python:view.not_eq(price_original, price)">
-          <span tal:replace="python:'%0.2f' % price_original">1.0</span>
-          <span tal:replace="view/currency">EUR</span>
-        </dd>
-        <dd class="price discount">
-          <span tal:replace="python:'%0.2f' % price">1.0</span>
-          <span tal:replace="view/currency">EUR</span>
-          (<span i18n:translate="gross">Gross</span>)
-        </dd>
-      </tal:gross>
-
-      <dt class="vat" i18n:translate="vat">Vat</dt>
-      <dd class="vat" tal:content="string:${view/item_vat}%">20 %</dd>
+        <tal:gross condition="view/display_gross"
+                define="price_original view/item_gross_original;
+                        price view/item_gross">
+          <span class="price" i18n:translate="price">Price</span>
+          <span class="price original"
+              tal:condition="python:view.not_eq(price_original, price)">
+            <span tal:replace="python:'%0.2f' % price_original">1.0</span>
+            <span tal:replace="view/currency">EUR</span>
+          </span>
+          <span class="price discount">
+            <span tal:replace="python:'%0.2f' % price">1.0</span>
+            <span tal:replace="view/currency">EUR</span>
+            (<span i18n:translate="gross">Gross</span>)
+          </span>
+        </tal:gross>
 
+        <span class="vat" i18n:translate="vat">Vat</span>
+        <span class="vat" tal:content="string:${view/item_vat}%">20 %</span>
+      </div>
+    </div>
     </tal:info>
 
     <tal:buy condition="view/can_buy_items">
-
-      <dt class="quantity" tal:content="view/quantity_unit">Quantity</dt>
-      <dd class="quantity">
-        <input type="number"
-               size="2"
-               value="1"
-               min="0"
-               class="cart_item_count"
-               tal:define="css python: view.quantity_unit_float and \
-                                       'cart_item_count quantity_unit_float' or
-                                       'cart_item_count';"
-               tal:attributes="class css;
-                               disabled python: not addable and 'disabled' or None" />
-      </dd>
+    <div class="form-group form-inline col-md">
+      <div class="input-group">
+        <label class="quantity mr-2" tal:content="view/quantity_unit">Quantity</label>
+        <div class="quantity">
+          <input type="number"
+                size="2"
+                value="1"
+                min="0"
+                class="form-control cart_item_count"
+                tal:define="css python: view.quantity_unit_float and \
+                                        'form-control cart_item_count quantity_unit_float' or
+                                        'form-control cart_item_count';"
+                tal:attributes="class css;
+                                disabled python: not addable and 'disabled' or None" />
+        </div>
 
       <tal:comment condition="view/comment_enabled">
-        <dt class="extra_comment" i18n:translate="comment">Comment</dt>
-        <dd class="extra_comment">
+        <div class="extra_comment" i18n:translate="comment">Comment</div>
+        <div class="extra_comment">
           <input type="text"
                  size="16"
                  value=""
-                 class="cart_item_comment"
+                 class="form-control cart_item_comment"
                  tal:define="css python: view.comment_required and \
-                                         'cart_item_comment required' or
-                                         'cart_item_comment';"
+                                         'form-control cart_item_comment required' or
+                                         'form-control cart_item_comment';"
                  tal:attributes="class css;
                                  disabled python: not addable and 'disabled' or None" />
-        </dd>
+        </div>
       </tal:comment>
+      <span tal:condition="view/can_buy_items"
+            class="cart_item_uid"
+            style="display: none;"
+            tal:content="view/item_uid">12345678</span>
 
-    </tal:buy>
-  </dl>
+      <tal:addable condition="addable">
+        <a href="" i18n:attributes="title add_to_cart"
+           class="btn btn-primary add_cart_item buyable_add_to_cart show_status_message">
+           <svg class="bi bi-bag" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path fill-rule="evenodd" d="M14 5H2v9a1 1 0 001 1h10a1 1 0 001-1V5zM1 4v10a2 2 0 002 2h10a2 2 0 002-2V4H1z" clip-rule="evenodd"/>
+            <path d="M8 1.5A2.5 2.5 0 005.5 4h-1a3.5 3.5 0 117 0h-1A2.5 2.5 0 008 1.5z"/>
+          </svg>
 
-  <tal:buy condition="view/can_buy_items">
-    <span tal:condition="view/can_buy_items"
-          class="cart_item_uid"
-          style="display: none;"
-          tal:content="view/item_uid">12345678</span>
+           <span i18n:translate="add_to_cart">add to cart</span>
+        </a>
+        <a href="" i18n:attributes="title update_cart"
+           class="btn btn-light update_cart_item buyable_update_cart show_status_message">
+           <svg class="bi bi-arrow-repeat" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path fill-rule="evenodd" d="M2.854 7.146a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L2.5 8.207l1.646 1.647a.5.5 0 00.708-.708l-2-2zm13-1a.5.5 0 00-.708 0L13.5 7.793l-1.646-1.647a.5.5 0 00-.708.708l2 2a.5.5 0 00.708 0l2-2a.5.5 0 000-.708z" clip-rule="evenodd"/>
+            <path fill-rule="evenodd" d="M8 3a4.995 4.995 0 00-4.192 2.273.5.5 0 01-.837-.546A6 6 0 0114 8a.5.5 0 01-1.001 0 5 5 0 00-5-5zM2.5 7.5A.5.5 0 013 8a5 5 0 009.192 2.727.5.5 0 11.837.546A6 6 0 012 8a.5.5 0 01.501-.5z" clip-rule="evenodd"/>
+          </svg>
+           <span i18n:translate="update_cart">update cart</span>
+        </a>
+      </tal:addable>
 
-    <tal:addable condition="addable">
-      <a href=""
-         class="context add_cart_item buyable_add_to_cart show_status_message"
-         i18n:translate="add_to_cart">add to cart</a>
-      <a href=""
-         class="context update_cart_item buyable_update_cart show_status_message"
-         i18n:translate="update_cart">update cart</a>
-    </tal:addable>
+      <tal:not_addable condition="not:addable">
+        <span class="buyable_add_to_cart_disabled"
+              i18n:translate="add_to_cart">add to cart</span>
+        <span class="buyable_update_cart_disabled"
+              i18n:translate="update_cart">update cart</span>
+      </tal:not_addable>
+    </div>
+  </div>
+  </tal:buy>
 
-    <tal:not_addable condition="not:addable">
-      <span class="buyable_add_to_cart_disabled"
-            i18n:translate="add_to_cart">add to cart</span>
-      <span class="buyable_update_cart_disabled"
-            i18n:translate="update_cart">update cart</span>
-    </tal:not_addable>
+  </div>
 
-  </tal:buy>
 
 </div>

From 7ec7b5ba2b0c8f6d90be5889f261f8aef53e8597 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 7 May 2020 15:29:10 +0200
Subject: [PATCH 02/74] update markup for bootstrap

---
 src/bda/plone/shop/browser/buyable.pt | 74 ++++++++++++++++-----------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index 66f4c07f..a476dc5c 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -10,9 +10,9 @@
                      class string:buyable viewlet ${css}">
 
   <tal:info condition="view/can_view_buyable_info">
-    <div class="availabilityWrapper">
-      <div class="availability" tal:condition="view/show_available">
-        <strong i18n:translate="availability">Availability</strong>
+    <div class="availabilityWrapper form-row">
+      <div class="availability form-group form-inline" tal:condition="view/show_available">
+        <strong class="mr-2" i18n:translate="availability">Availability</strong>
         <div class="signal green"
              tal:attributes="class string:signal ${view/availability_signal}">
           &nbsp;
@@ -26,50 +26,55 @@
   </tal:info>
 
   <div class="form-row details ${python:'with-comment' if view.comment_enabled else 'without-comment'}">
-    <tal:info condition="view/can_view_buyable_info">
     <div class="form-group form-inline col-md">
-      <div class="input-group">
+    <tal:info condition="view/can_view_buyable_info">
+      <div class="price-group input-group mr-4">
         <tal:net condition="not:view/display_gross"
                 define="price_original view/item_net_original;
                         price view/item_net">
-          <span class="price" i18n:translate="price">Price</span>
-          <span class="price original"
-              tal:condition="python:view.not_eq(price_original, price)">
-            <span tal:replace="python:'%0.2f' % price_original">1.00</span>
-            <span tal:replace="view/currency">EUR</span>
+          <span class="price h4 mb-1">
+            <span class="label mr-2"><span i18n:translate="price" tal:omit-tag="">Price</span>:</span>
+            <span class="value original"
+                tal:condition="python:view.not_eq(price_original, price)">
+              <span tal:replace="python:'%0.2f' % price_original">1.00</span>
+              <span tal:replace="view/currency">EUR</span>
+            </span>
           </span>
-          <span class="price discount">
+          <span class="discount">
             <span tal:replace="python:'%0.2f' % view.item_net">1.00</span>
             <span tal:replace="view/currency">EUR</span>
-            (<span i18n:translate="net">Net</span>)
           </span>
         </tal:net>
 
         <tal:gross condition="view/display_gross"
                 define="price_original view/item_gross_original;
                         price view/item_gross">
-          <span class="price" i18n:translate="price">Price</span>
-          <span class="price original"
-              tal:condition="python:view.not_eq(price_original, price)">
-            <span tal:replace="python:'%0.2f' % price_original">1.0</span>
-            <span tal:replace="view/currency">EUR</span>
+          <span class="price h4 mb-1">
+            <span class="label mr-2"><span i18n:translate="price" tal:omit-tag="">Price</span>:</span>
+            <span class="value original"
+                tal:condition="python:view.not_eq(price_original, price)">
+              <span tal:replace="python:'%0.2f' % price_original">1.0</span>
+              <span tal:replace="view/currency">EUR</span>
           </span>
-          <span class="price discount">
+          <span class="discount">
             <span tal:replace="python:'%0.2f' % price">1.0</span>
             <span tal:replace="view/currency">EUR</span>
-            (<span i18n:translate="gross">Gross</span>)
+          </span>
           </span>
         </tal:gross>
-
-        <span class="vat" i18n:translate="vat">Vat</span>
-        <span class="vat" tal:content="string:${view/item_vat}%">20 %</span>
+        <label class="vat text-muted ml-2">
+          <span tal:condition="view/display_gross"
+                i18n:translate="incl." tal:omit-tag="">incl.</span>
+          <span tal:condition="not:view/display_gross"
+                i18n:translate="excl." tal:omit-tag="">excl.</span>
+                <span class="" i18n:translate="vat">Vat</span>
+          <span class="" tal:content="string:${view/item_vat}%">20 %</span>
+        </label>
       </div>
-    </div>
     </tal:info>
 
     <tal:buy condition="view/can_buy_items">
-    <div class="form-group form-inline col-md">
-      <div class="input-group">
+      <div class="input-group ml-2">
         <label class="quantity mr-2" tal:content="view/quantity_unit">Quantity</label>
         <div class="quantity">
           <input type="number"
@@ -83,9 +88,11 @@
                 tal:attributes="class css;
                                 disabled python: not addable and 'disabled' or None" />
         </div>
+      </div>
 
       <tal:comment condition="view/comment_enabled">
-        <div class="extra_comment" i18n:translate="comment">Comment</div>
+      <div class="input-group ml-2">
+        <label class="extra_comment mr-2" i18n:translate="comment">Comment</label>
         <div class="extra_comment">
           <input type="text"
                  size="16"
@@ -97,13 +104,15 @@
                  tal:attributes="class css;
                                  disabled python: not addable and 'disabled' or None" />
         </div>
+      </div>
       </tal:comment>
       <span tal:condition="view/can_buy_items"
-            class="cart_item_uid"
-            style="display: none;"
-            tal:content="view/item_uid">12345678</span>
+      class="cart_item_uid"
+      style="display: none;"
+      tal:content="view/item_uid">12345678</span>
 
       <tal:addable condition="addable">
+      <div class="input-group ml-2">
         <a href="" i18n:attributes="title add_to_cart"
            class="btn btn-primary add_cart_item buyable_add_to_cart show_status_message">
            <svg class="bi bi-bag" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -121,17 +130,20 @@
           </svg>
            <span i18n:translate="update_cart">update cart</span>
         </a>
+      </div>
       </tal:addable>
 
       <tal:not_addable condition="not:addable">
+      <div class="input-group ml-2">
         <span class="buyable_add_to_cart_disabled"
               i18n:translate="add_to_cart">add to cart</span>
         <span class="buyable_update_cart_disabled"
               i18n:translate="update_cart">update cart</span>
+      </div>
       </tal:not_addable>
-    </div>
+
+    </tal:buy>
   </div>
-  </tal:buy>
 
   </div>
 

From 6054dccd64620409ec406703f37f10f423c5d7a7 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 7 May 2020 15:31:15 +0200
Subject: [PATCH 03/74] remove update action

---
 src/bda/plone/shop/browser/buyable.pt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index a476dc5c..ed7b280d 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -122,14 +122,6 @@
 
            <span i18n:translate="add_to_cart">add to cart</span>
         </a>
-        <a href="" i18n:attributes="title update_cart"
-           class="btn btn-light update_cart_item buyable_update_cart show_status_message">
-           <svg class="bi bi-arrow-repeat" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path fill-rule="evenodd" d="M2.854 7.146a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L2.5 8.207l1.646 1.647a.5.5 0 00.708-.708l-2-2zm13-1a.5.5 0 00-.708 0L13.5 7.793l-1.646-1.647a.5.5 0 00-.708.708l2 2a.5.5 0 00.708 0l2-2a.5.5 0 000-.708z" clip-rule="evenodd"/>
-            <path fill-rule="evenodd" d="M8 3a4.995 4.995 0 00-4.192 2.273.5.5 0 01-.837-.546A6 6 0 0114 8a.5.5 0 01-1.001 0 5 5 0 00-5-5zM2.5 7.5A.5.5 0 013 8a5 5 0 009.192 2.727.5.5 0 11.837.546A6 6 0 012 8a.5.5 0 01.501-.5z" clip-rule="evenodd"/>
-          </svg>
-           <span i18n:translate="update_cart">update cart</span>
-        </a>
       </div>
       </tal:addable>
 
@@ -137,8 +129,6 @@
       <div class="input-group ml-2">
         <span class="buyable_add_to_cart_disabled"
               i18n:translate="add_to_cart">add to cart</span>
-        <span class="buyable_update_cart_disabled"
-              i18n:translate="update_cart">update cart</span>
       </div>
       </tal:not_addable>
 

From 88776afa7d0911f0ebbdc47006750cbe61fa2d91 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 7 May 2020 15:31:24 +0200
Subject: [PATCH 04/74] indentation

---
 src/bda/plone/shop/browser/buyable.pt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index ed7b280d..b47e3c22 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -55,11 +55,11 @@
                 tal:condition="python:view.not_eq(price_original, price)">
               <span tal:replace="python:'%0.2f' % price_original">1.0</span>
               <span tal:replace="view/currency">EUR</span>
-          </span>
-          <span class="discount">
-            <span tal:replace="python:'%0.2f' % price">1.0</span>
-            <span tal:replace="view/currency">EUR</span>
-          </span>
+            </span>
+            <span class="discount">
+              <span tal:replace="python:'%0.2f' % price">1.0</span>
+              <span tal:replace="view/currency">EUR</span>
+            </span>
           </span>
         </tal:gross>
         <label class="vat text-muted ml-2">

From 3f34bc4292f7d88201868b4ba8d0eabebf60f0d3 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 14 May 2020 18:46:45 +0200
Subject: [PATCH 05/74] Use Decimal for shipping and article defaults.

---
 CHANGES.rst                                   |  3 +
 src/bda/plone/shop/interfaces.py              | 21 +++---
 .../plone/shop/profiles/default/metadata.xml  |  2 +-
 src/bda/plone/shop/upgrades/configure.zcml    | 14 +++-
 src/bda/plone/shop/upgrades/profiles.zcml     |  8 +++
 .../upgrades/profiles/9_to_10/registry.xml    | 69 +++++++++++++++++++
 6 files changed, 105 insertions(+), 12 deletions(-)
 create mode 100644 src/bda/plone/shop/upgrades/profiles/9_to_10/registry.xml

diff --git a/CHANGES.rst b/CHANGES.rst
index 2dca4988..98628a20 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.0.dev0 (unreleased)
 ---------------------
 
+- Use Decimal for shipping and article defaults.
+  [agitator]
+
 - Use Decimal field for net price and cast to Decimal (for old values) in accessor.
   [jensens]
 
diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index a857ca42..1cde8b1e 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -5,6 +5,7 @@
 from bda.plone.shop import message_factory as _
 from collective.z3cform.datagridfield import DataGridFieldFactory
 from collective.z3cform.datagridfield.registry import DictRow
+from decimal import Decimal
 from plone.autoform.directives import widget
 from plone.supermodel import model
 from z3c.form.browser.checkbox import CheckBoxFieldWidget
@@ -208,7 +209,7 @@ class IShopArticleSettings(model.Schema):
         vocabulary="bda.plone.shop.vocabularies.QuantityUnitVocabulary",
     )
 
-    default_item_net = schema.Float(
+    default_item_net = schema.Decimal(
         title=_(u"label_default_item_net", default=u"Default Item net price"),
         required=False,
     )
@@ -236,7 +237,7 @@ class IShopArticleSettings(model.Schema):
         required=False,
     )
 
-    default_item_cart_count_limit = schema.Float(
+    default_item_cart_count_limit = schema.Decimal(
         title=_(
             u"label_default_item_cart_count_limit",
             default="Quantity limit of an item in the cart.",
@@ -244,7 +245,7 @@ class IShopArticleSettings(model.Schema):
         required=False,
     )
 
-    default_item_stock_warning_threshold = schema.Float(
+    default_item_stock_warning_threshold = schema.Decimal(
         title=_(
             u"label_default_item_stock_warning_threshold",
             default="Item stock warning threshold.",
@@ -324,7 +325,7 @@ class IShopShippingSettings(model.Schema):
 
     # default shipping related settings
 
-    free_shipping_limit = schema.Float(
+    free_shipping_limit = schema.Decimal(
         title=_(u"label_free_shipping_limit", default=u"Free Shipping Limit"),
         description=_(
             u"help_free_shipping_limit",
@@ -335,7 +336,7 @@ class IShopShippingSettings(model.Schema):
             u"gross' setting",
         ),
         required=True,
-        default=200.0,
+        default=Decimal('200.0'),
     )
 
     shipping_limit_from_gross = schema.Bool(
@@ -350,14 +351,14 @@ class IShopShippingSettings(model.Schema):
         ),
     )
 
-    flat_shipping_cost = schema.Float(
+    flat_shipping_cost = schema.Decimal(
         title=_(u"label_flat_shipping_cost", default=u"Flat shipping cost"),
         description=_(u"help_flat_shipping_cost", default=u"Net flat shipping cost"),
         required=True,
-        default=10.0,
+        default=Decimal('10.0'),
     )
 
-    item_shipping_cost = schema.Float(
+    item_shipping_cost = schema.Decimal(
         title=_(u"label_item_shipping_cost", default=u"Item shipping cost"),
         description=_(
             u"help_item_shipping_cost",
@@ -367,7 +368,7 @@ class IShopShippingSettings(model.Schema):
             u"is used",
         ),
         required=True,
-        default=0.0,
+        default=Decimal('0.0'),
     )
 
 
@@ -674,7 +675,7 @@ class IPaymentTextSettings(model.Schema):
         required=False,
     )
 
-    cash_on_delivery_costs = schema.Float(
+    cash_on_delivery_costs = schema.Decimal(
         title=_(
             u"label_cash_on_delivery_costs", default=u"Cash on delivery costs in gross"
         ),
diff --git a/src/bda/plone/shop/profiles/default/metadata.xml b/src/bda/plone/shop/profiles/default/metadata.xml
index 6c05bc3c..aff920cf 100644
--- a/src/bda/plone/shop/profiles/default/metadata.xml
+++ b/src/bda/plone/shop/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>9</version>
+  <version>10</version>
   <dependencies>
     <dependency>profile-plone.app.registry:default</dependency>
     <dependency>profile-collective.z3cform.datagridfield:default</dependency>
diff --git a/src/bda/plone/shop/upgrades/configure.zcml b/src/bda/plone/shop/upgrades/configure.zcml
index 95477de7..88798ab4 100644
--- a/src/bda/plone/shop/upgrades/configure.zcml
+++ b/src/bda/plone/shop/upgrades/configure.zcml
@@ -92,10 +92,22 @@
     profile="bda.plone.shop:default">
 
     <genericsetup:upgradeDepends
-      title="GS Profile: Add invoice settings"
+      title="GS Profile: Update invoice settings"
       import_profile="bda.plone.shop.upgrades:8_to_9"
       run_deps="False" />
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+    source="9"
+    destination="10"
+    profile="bda.plone.shop:default">
+
+    <genericsetup:upgradeDepends
+      title="GS Profile: Update shipping and item defaults from float to decimal"
+      import_profile="bda.plone.shop.upgrades:9_to_10"
+      run_deps="False" />
+
+  </genericsetup:upgradeSteps>
+
 </configure>
diff --git a/src/bda/plone/shop/upgrades/profiles.zcml b/src/bda/plone/shop/upgrades/profiles.zcml
index 5792674b..37b98f51 100644
--- a/src/bda/plone/shop/upgrades/profiles.zcml
+++ b/src/bda/plone/shop/upgrades/profiles.zcml
@@ -50,4 +50,12 @@
     provides="Products.GenericSetup.interfaces.EXTENSION"
     for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot" />
 
+  <gs:registerProfile
+    name="9_to_10"
+    title="Upgrade policy GS profile to 9"
+    directory="profiles/9_to_10"
+    description=""
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+    for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot" />
+
 </configure>
diff --git a/src/bda/plone/shop/upgrades/profiles/9_to_10/registry.xml b/src/bda/plone/shop/upgrades/profiles/9_to_10/registry.xml
new file mode 100644
index 00000000..ef1aa048
--- /dev/null
+++ b/src/bda/plone/shop/upgrades/profiles/9_to_10/registry.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<registry>
+
+  <!-- bda.plone.shop.interfaces.IShopShippingSettings -->
+
+  <record name="bda.plone.shop.interfaces.IShopShippingSettings.free_shipping_limit" remove="true"
+          interface="bda.plone.shop.interfaces.IShopShippingSettings" field="free_shipping_limit">
+  </record>
+  <record name="bda.plone.shop.interfaces.IShopShippingSettings.free_shipping_limit"
+          interface="bda.plone.shop.interfaces.IShopShippingSettings" field="free_shipping_limit">
+    <value>200.0</value>
+  </record>
+
+  <record name="bda.plone.shop.interfaces.IShopShippingSettings.flat_shipping_cost" remove="true"
+          interface="bda.plone.shop.interfaces.IShopShippingSettings" field="flat_shipping_cost">
+  </record>
+  <record name="bda.plone.shop.interfaces.IShopShippingSettings.flat_shipping_cost"
+          interface="bda.plone.shop.interfaces.IShopShippingSettings" field="flat_shipping_cost">
+    <value>10.0</value>
+  </record>
+
+  <record name="bda.plone.shop.interfaces.IShopShippingSettings.item_shipping_cost" remove="true"
+          interface="bda.plone.shop.interfaces.IShopShippingSettings" field="item_shipping_cost">
+  </record>
+  <record name="bda.plone.shop.interfaces.IShopShippingSettings.item_shipping_cost"
+          interface="bda.plone.shop.interfaces.IShopShippingSettings" field="item_shipping_cost">
+    <value>0.0</value>
+  </record>
+
+
+  <!-- bda.plone.shop.interfaces.IShopArticleSettings -->
+
+  <record name="bda.plone.shop.interfaces.IShopArticleSettings.default_item_net" remove="true"
+          interface="bda.plone.shop.interfaces.IShopArticleSettings" field="default_item_net">
+  </record>
+  <record name="bda.plone.shop.interfaces.IShopArticleSettings.default_item_net"
+          interface="bda.plone.shop.interfaces.IShopArticleSettings" field="default_item_net">
+    <value>10</value>
+  </record>
+
+  <record name="bda.plone.shop.interfaces.IShopArticleSettings.default_item_cart_count_limit" remove="true"
+          interface="bda.plone.shop.interfaces.IShopArticleSettings" field="default_item_cart_count_limit">
+  </record>
+  <record name="bda.plone.shop.interfaces.IShopArticleSettings.default_item_cart_count_limit"
+          interface="bda.plone.shop.interfaces.IShopArticleSettings" field="default_item_cart_count_limit">
+    <value/>
+  </record>
+
+  <record name="bda.plone.shop.interfaces.IShopArticleSettings.default_item_stock_warning_threshold" remove="true"
+          interface="bda.plone.shop.interfaces.IShopArticleSettings" field="default_item_stock_warning_threshold">
+  </record>
+  <record name="bda.plone.shop.interfaces.IShopArticleSettings.default_item_stock_warning_threshold"
+          interface="bda.plone.shop.interfaces.IShopArticleSettings" field="default_item_stock_warning_threshold">
+    <value/>
+  </record>
+
+
+  <!-- bda.plone.shop.interfaces.IPaymentTextSettings -->
+
+  <record name="bda.plone.shop.interfaces.IPaymentTextSettings.cash_on_delivery_costs" remove="true"
+          interface="bda.plone.shop.interfaces.IPaymentTextSettings" field="cash_on_delivery_costs">
+  </record>
+  <record name="bda.plone.shop.interfaces.IPaymentTextSettings.cash_on_delivery_costs"
+          interface="bda.plone.shop.interfaces.IPaymentTextSettings" field="cash_on_delivery_costs">
+    <value>9.9</value>
+  </record>
+
+
+</registry>

From a4cce6f8d16ebed345f54ac58ad96a025eebcad4 Mon Sep 17 00:00:00 2001
From: agitator <agitator@users.noreply.github.com>
Date: Fri, 15 May 2020 13:51:47 +0200
Subject: [PATCH 06/74] Add warning: Related settings will be reset!

---
 src/bda/plone/shop/upgrades/configure.zcml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/upgrades/configure.zcml b/src/bda/plone/shop/upgrades/configure.zcml
index 88798ab4..049ea8b7 100644
--- a/src/bda/plone/shop/upgrades/configure.zcml
+++ b/src/bda/plone/shop/upgrades/configure.zcml
@@ -104,7 +104,7 @@
     profile="bda.plone.shop:default">
 
     <genericsetup:upgradeDepends
-      title="GS Profile: Update shipping and item defaults from float to decimal"
+      title="GS Profile: Update shipping and item defaults from float to decimal. Warning: Related settings will be reset!"
       import_profile="bda.plone.shop.upgrades:9_to_10"
       run_deps="False" />
 

From 0418154a8468827216693a1a2cb4addadabee16d Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 15 May 2020 10:13:37 +0200
Subject: [PATCH 07/74] use BooleanIndex

---
 src/bda/plone/shop/profiles/default/catalog.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/profiles/default/catalog.xml b/src/bda/plone/shop/profiles/default/catalog.xml
index ef969842..d2ab72cf 100644
--- a/src/bda/plone/shop/profiles/default/catalog.xml
+++ b/src/bda/plone/shop/profiles/default/catalog.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <object name="portal_catalog" meta_type="Plone Catalog Tool">
-  <index name="item_buyable" meta_type="FieldIndex">
+  <index name="item_buyable" meta_type="BooleanIndex">
     <indexed_attr value="item_buyable" />
   </index>
+ <column value="item_buyable"/>
  <column value="item_net"/>
  <column value="item_buyable_start"/>
  <column value="item_buyable_end"/>

From a8aabee8af373525ba2d0573c97b47d5d337615f Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 15 May 2020 14:26:45 +0200
Subject: [PATCH 08/74] add upgrade step

---
 CHANGES.rst                                         |  3 +++
 src/bda/plone/shop/profiles/default/metadata.xml    |  2 +-
 src/bda/plone/shop/upgrades/configure.zcml          | 13 +++++++++++++
 src/bda/plone/shop/upgrades/profiles.zcml           | 10 +++++++++-
 .../shop/upgrades/profiles/10_to_11/catalog.xml     |  7 +++++++
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml

diff --git a/CHANGES.rst b/CHANGES.rst
index 98628a20..64cb155e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.0.dev0 (unreleased)
 ---------------------
 
+- Use BooleanIndex for item_buyable & add metadata.
+  [agitator]
+
 - Use Decimal for shipping and article defaults.
   [agitator]
 
diff --git a/src/bda/plone/shop/profiles/default/metadata.xml b/src/bda/plone/shop/profiles/default/metadata.xml
index aff920cf..72bd9a08 100644
--- a/src/bda/plone/shop/profiles/default/metadata.xml
+++ b/src/bda/plone/shop/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>10</version>
+  <version>11</version>
   <dependencies>
     <dependency>profile-plone.app.registry:default</dependency>
     <dependency>profile-collective.z3cform.datagridfield:default</dependency>
diff --git a/src/bda/plone/shop/upgrades/configure.zcml b/src/bda/plone/shop/upgrades/configure.zcml
index 049ea8b7..af21b1e4 100644
--- a/src/bda/plone/shop/upgrades/configure.zcml
+++ b/src/bda/plone/shop/upgrades/configure.zcml
@@ -110,4 +110,17 @@
 
   </genericsetup:upgradeSteps>
 
+
+  <genericsetup:upgradeSteps
+    source="10"
+    destination="11"
+    profile="bda.plone.shop:default">
+
+    <genericsetup:upgradeDepends
+      title="GS Profile: Use BooleanIndex for item_buyable & add metadata"
+      import_profile="bda.plone.shop.upgrades:10_to_10"
+      run_deps="False" />
+
+  </genericsetup:upgradeSteps>
+
 </configure>
diff --git a/src/bda/plone/shop/upgrades/profiles.zcml b/src/bda/plone/shop/upgrades/profiles.zcml
index 37b98f51..8a6848ed 100644
--- a/src/bda/plone/shop/upgrades/profiles.zcml
+++ b/src/bda/plone/shop/upgrades/profiles.zcml
@@ -52,10 +52,18 @@
 
   <gs:registerProfile
     name="9_to_10"
-    title="Upgrade policy GS profile to 9"
+    title="Upgrade policy GS profile to 10"
     directory="profiles/9_to_10"
     description=""
     provides="Products.GenericSetup.interfaces.EXTENSION"
     for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot" />
 
+  <gs:registerProfile
+    name="10_to_11"
+    title="Upgrade policy GS profile to 11"
+    directory="profiles/10_to_11"
+    description=""
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+    for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot" />
+
 </configure>
diff --git a/src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml b/src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml
new file mode 100644
index 00000000..960660b2
--- /dev/null
+++ b/src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<object name="portal_catalog" meta_type="Plone Catalog Tool">
+  <index name="item_buyable" meta_type="BooleanIndex">
+    <indexed_attr value="item_buyable" />
+  </index>
+ <column value="item_buyable"/>
+</object>

From fd7cb4a9245cc0b6dd7b05997f139b843f1c205f Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 15 May 2020 14:44:18 +0200
Subject: [PATCH 09/74] remove old index

---
 src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml b/src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml
index 960660b2..15a85ab2 100644
--- a/src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml
+++ b/src/bda/plone/shop/upgrades/profiles/10_to_11/catalog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <object name="portal_catalog" meta_type="Plone Catalog Tool">
+  <index name="item_buyable" remove="true"/>
   <index name="item_buyable" meta_type="BooleanIndex">
     <indexed_attr value="item_buyable" />
   </index>

From 31bcf86d89850192140f387ffcbcfabc83663d33 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 15 May 2020 15:31:05 +0200
Subject: [PATCH 10/74] use "and" instead of "&"

---
 src/bda/plone/shop/upgrades/configure.zcml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/upgrades/configure.zcml b/src/bda/plone/shop/upgrades/configure.zcml
index af21b1e4..5e0e7d6d 100644
--- a/src/bda/plone/shop/upgrades/configure.zcml
+++ b/src/bda/plone/shop/upgrades/configure.zcml
@@ -117,7 +117,7 @@
     profile="bda.plone.shop:default">
 
     <genericsetup:upgradeDepends
-      title="GS Profile: Use BooleanIndex for item_buyable & add metadata"
+      title="GS Profile: Use BooleanIndex for item_buyable and add metadata"
       import_profile="bda.plone.shop.upgrades:10_to_10"
       run_deps="False" />
 

From 857e9c1505b82de2e4ac90e6321a95b737c11792 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Sat, 16 May 2020 13:17:11 +0200
Subject: [PATCH 11/74] markup tweaks

---
 src/bda/plone/shop/browser/buyable.pt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index b47e3c22..5c250e41 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -74,7 +74,7 @@
     </tal:info>
 
     <tal:buy condition="view/can_buy_items">
-      <div class="input-group ml-2">
+      <div class="quantity-group input-group ml-2">
         <label class="quantity mr-2" tal:content="view/quantity_unit">Quantity</label>
         <div class="quantity">
           <input type="number"
@@ -91,7 +91,7 @@
       </div>
 
       <tal:comment condition="view/comment_enabled">
-      <div class="input-group ml-2">
+      <div class="comment-group input-group ml-2">
         <label class="extra_comment mr-2" i18n:translate="comment">Comment</label>
         <div class="extra_comment">
           <input type="text"
@@ -112,9 +112,9 @@
       tal:content="view/item_uid">12345678</span>
 
       <tal:addable condition="addable">
-      <div class="input-group ml-2">
+      <div class="add-to-cart-group input-group ml-2">
         <a href="" i18n:attributes="title add_to_cart"
-           class="btn btn-primary add_cart_item buyable_add_to_cart show_status_message">
+           class="btn btn-outline-primary add_cart_item buyable_add_to_cart show_status_message">
            <svg class="bi bi-bag" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
             <path fill-rule="evenodd" d="M14 5H2v9a1 1 0 001 1h10a1 1 0 001-1V5zM1 4v10a2 2 0 002 2h10a2 2 0 002-2V4H1z" clip-rule="evenodd"/>
             <path d="M8 1.5A2.5 2.5 0 005.5 4h-1a3.5 3.5 0 117 0h-1A2.5 2.5 0 008 1.5z"/>
@@ -126,7 +126,7 @@
       </tal:addable>
 
       <tal:not_addable condition="not:addable">
-      <div class="input-group ml-2">
+      <div class="add-to-cart-group input-group ml-2">
         <span class="buyable_add_to_cart_disabled"
               i18n:translate="add_to_cart">add to cart</span>
       </div>

From 55b91efc95acbe1482947810b55174019b667549 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Sat, 16 May 2020 16:29:16 +0200
Subject: [PATCH 12/74] damn numbers

---
 src/bda/plone/shop/upgrades/configure.zcml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/upgrades/configure.zcml b/src/bda/plone/shop/upgrades/configure.zcml
index 5e0e7d6d..77e30761 100644
--- a/src/bda/plone/shop/upgrades/configure.zcml
+++ b/src/bda/plone/shop/upgrades/configure.zcml
@@ -118,7 +118,7 @@
 
     <genericsetup:upgradeDepends
       title="GS Profile: Use BooleanIndex for item_buyable and add metadata"
-      import_profile="bda.plone.shop.upgrades:10_to_10"
+      import_profile="bda.plone.shop.upgrades:10_to_11"
       run_deps="False" />
 
   </genericsetup:upgradeSteps>

From 3577a2dfd29be9b20c4eccc8a88cb32b5e6c9fe1 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Sun, 24 May 2020 20:13:50 +0200
Subject: [PATCH 13/74] currency before price

---
 src/bda/plone/shop/browser/buyable.pt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index 5c250e41..626efd8a 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -36,13 +36,13 @@
             <span class="label mr-2"><span i18n:translate="price" tal:omit-tag="">Price</span>:</span>
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
+                <span tal:replace="view/currency">EUR</span>
               <span tal:replace="python:'%0.2f' % price_original">1.00</span>
-              <span tal:replace="view/currency">EUR</span>
             </span>
           </span>
           <span class="discount">
-            <span tal:replace="python:'%0.2f' % view.item_net">1.00</span>
             <span tal:replace="view/currency">EUR</span>
+            <span tal:replace="python:'%0.2f' % view.item_net">1.00</span>
           </span>
         </tal:net>
 
@@ -53,12 +53,12 @@
             <span class="label mr-2"><span i18n:translate="price" tal:omit-tag="">Price</span>:</span>
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
-              <span tal:replace="python:'%0.2f' % price_original">1.0</span>
               <span tal:replace="view/currency">EUR</span>
+              <span tal:replace="python:'%0.2f' % price_original">1.0</span>
             </span>
             <span class="discount">
-              <span tal:replace="python:'%0.2f' % price">1.0</span>
               <span tal:replace="view/currency">EUR</span>
+              <span tal:replace="python:'%0.2f' % price">1.0</span>
             </span>
           </span>
         </tal:gross>

From b211119aff9c6b8c53094ffd6bc6b6b2eac471cb Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 29 May 2020 09:21:59 +0200
Subject: [PATCH 14/74] use sm form-controls

---
 src/bda/plone/shop/browser/buyable.pt | 36 +++++++++++++--------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index 626efd8a..614d5370 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -28,12 +28,11 @@
   <div class="form-row details ${python:'with-comment' if view.comment_enabled else 'without-comment'}">
     <div class="form-group form-inline col-md">
     <tal:info condition="view/can_view_buyable_info">
-      <div class="price-group input-group mr-4">
+      <div class="price-group input-group mr-2">
         <tal:net condition="not:view/display_gross"
                 define="price_original view/item_net_original;
                         price view/item_net">
           <span class="price h4 mb-1">
-            <span class="label mr-2"><span i18n:translate="price" tal:omit-tag="">Price</span>:</span>
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
                 <span tal:replace="view/currency">EUR</span>
@@ -50,7 +49,6 @@
                 define="price_original view/item_gross_original;
                         price view/item_gross">
           <span class="price h4 mb-1">
-            <span class="label mr-2"><span i18n:translate="price" tal:omit-tag="">Price</span>:</span>
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
               <span tal:replace="view/currency">EUR</span>
@@ -62,45 +60,45 @@
             </span>
           </span>
         </tal:gross>
-        <label class="vat text-muted ml-2">
+        <label class="vat text-muted ml-2 mr-1">
           <span tal:condition="view/display_gross"
-                i18n:translate="incl." tal:omit-tag="">incl.</span>
+                class="mr-1" i18n:translate="incl.">incl.</span>
           <span tal:condition="not:view/display_gross"
-                i18n:translate="excl." tal:omit-tag="">excl.</span>
-                <span class="" i18n:translate="vat">Vat</span>
+                class="mr-1" i18n:translate="excl.">excl.</span>
+                <span class="mr-1" i18n:translate="vat">Vat</span>
           <span class="" tal:content="string:${view/item_vat}%">20 %</span>
         </label>
       </div>
     </tal:info>
 
     <tal:buy condition="view/can_buy_items">
-      <div class="quantity-group input-group ml-2">
+      <div class="quantity-group input-group">
         <label class="quantity mr-2" tal:content="view/quantity_unit">Quantity</label>
-        <div class="quantity">
+        <div class="quantity mr-2">
           <input type="number"
                 size="2"
                 value="1"
                 min="0"
-                class="form-control cart_item_count"
+                class="form-control form-control-sm cart_item_count"
                 tal:define="css python: view.quantity_unit_float and \
-                                        'form-control cart_item_count quantity_unit_float' or
-                                        'form-control cart_item_count';"
+                                        'form-control form-control-sm cart_item_count quantity_unit_float' or
+                                        'form-control form-control-sm cart_item_count';"
                 tal:attributes="class css;
                                 disabled python: not addable and 'disabled' or None" />
         </div>
       </div>
 
       <tal:comment condition="view/comment_enabled">
-      <div class="comment-group input-group ml-2">
+      <div class="comment-group input-group">
         <label class="extra_comment mr-2" i18n:translate="comment">Comment</label>
         <div class="extra_comment">
           <input type="text"
                  size="16"
                  value=""
-                 class="form-control cart_item_comment"
+                 class="form-control form-control-sm cart_item_comment"
                  tal:define="css python: view.comment_required and \
-                                         'form-control cart_item_comment required' or
-                                         'form-control cart_item_comment';"
+                                         'form-control form-control-sm cart_item_comment required' or
+                                         'form-control form-control-sm cart_item_comment';"
                  tal:attributes="class css;
                                  disabled python: not addable and 'disabled' or None" />
         </div>
@@ -112,9 +110,9 @@
       tal:content="view/item_uid">12345678</span>
 
       <tal:addable condition="addable">
-      <div class="add-to-cart-group input-group ml-2">
+      <div class="add-to-cart-group input-group">
         <a href="" i18n:attributes="title add_to_cart"
-           class="btn btn-outline-primary add_cart_item buyable_add_to_cart show_status_message">
+           class="btn btn-outline-primary btn-sm add_cart_item buyable_add_to_cart show_status_message">
            <svg class="bi bi-bag" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
             <path fill-rule="evenodd" d="M14 5H2v9a1 1 0 001 1h10a1 1 0 001-1V5zM1 4v10a2 2 0 002 2h10a2 2 0 002-2V4H1z" clip-rule="evenodd"/>
             <path d="M8 1.5A2.5 2.5 0 005.5 4h-1a3.5 3.5 0 117 0h-1A2.5 2.5 0 008 1.5z"/>
@@ -126,7 +124,7 @@
       </tal:addable>
 
       <tal:not_addable condition="not:addable">
-      <div class="add-to-cart-group input-group ml-2">
+      <div class="add-to-cart-group input-group">
         <span class="buyable_add_to_cart_disabled"
               i18n:translate="add_to_cart">add to cart</span>
       </div>

From 6a3f29190e33be6fe1c2050a320e9c9cdd083566 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 29 May 2020 09:39:51 +0200
Subject: [PATCH 15/74] update translations

---
 src/bda/plone/shop/locales/bda.plone.shop.pot | 344 +++++++++---------
 .../locales/de/LC_MESSAGES/bda.plone.shop.po  | 341 ++++++++---------
 .../locales/en/LC_MESSAGES/bda.plone.shop.po  | 341 ++++++++---------
 .../locales/fr/LC_MESSAGES/bda.plone.shop.po  | 341 ++++++++---------
 .../locales/it/LC_MESSAGES/bda.plone.shop.po  | 341 ++++++++---------
 .../locales/nl/LC_MESSAGES/bda.plone.shop.po  | 341 ++++++++---------
 .../locales/nn/LC_MESSAGES/bda.plone.shop.po  | 341 ++++++++---------
 .../locales/no/LC_MESSAGES/bda.plone.shop.po  | 341 ++++++++---------
 8 files changed, 1377 insertions(+), 1354 deletions(-)

diff --git a/src/bda/plone/shop/locales/bda.plone.shop.pot b/src/bda/plone/shop/locales/bda.plone.shop.pot
index a6438086..dafe0c83 100644
--- a/src/bda/plone/shop/locales/bda.plone.shop.pot
+++ b/src/bda/plone/shop/locales/bda.plone.shop.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-03-27 15:22+0000\n"
+"POT-Creation-Date: 2020-05-28 23:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr ""
 
@@ -32,27 +32,27 @@ msgid "Activate vendor area on this context"
 msgstr ""
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr ""
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr ""
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr ""
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr ""
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgid "Disables Buyable"
 msgstr ""
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr ""
 
@@ -86,37 +86,37 @@ msgid "Enable Vendor Area"
 msgstr ""
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr ""
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr ""
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr ""
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr ""
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr ""
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr ""
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr ""
 
@@ -129,12 +129,12 @@ msgid "Personal Preferences"
 msgstr ""
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr ""
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr ""
 
@@ -143,15 +143,23 @@ msgstr ""
 msgid "Shop settings"
 msgstr ""
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr ""
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr ""
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -177,12 +185,12 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr ""
 
-#. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr ""
 
@@ -192,22 +200,22 @@ msgid "administration"
 msgstr ""
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr ""
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr ""
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr ""
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr ""
 
@@ -276,7 +284,8 @@ msgid "centimeter"
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr ""
 
@@ -335,6 +344,10 @@ msgstr ""
 msgid "enabled_vendor"
 msgstr ""
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr ""
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -410,23 +423,18 @@ msgstr ""
 msgid "gram"
 msgstr ""
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr ""
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr ""
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr ""
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr ""
 
@@ -436,12 +444,12 @@ msgid "help_alternative_delivery"
 msgstr ""
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr ""
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr ""
 
@@ -458,32 +466,32 @@ msgid "help_country"
 msgstr ""
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr ""
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr ""
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr ""
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr ""
 
@@ -493,12 +501,12 @@ msgid "help_firstname"
 msgstr ""
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr ""
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr ""
 
@@ -507,92 +515,92 @@ msgid "help_gender"
 msgstr ""
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr ""
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr ""
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr ""
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr ""
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr ""
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr ""
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr ""
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr ""
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr ""
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr ""
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr ""
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr ""
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr ""
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr ""
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr ""
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr ""
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr ""
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr ""
 
@@ -602,12 +610,12 @@ msgid "help_lastname"
 msgstr ""
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr ""
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr ""
 
@@ -616,44 +624,44 @@ msgid "help_phone"
 msgstr ""
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr ""
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr ""
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr ""
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr ""
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr ""
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr ""
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr ""
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr ""
 
@@ -662,12 +670,12 @@ msgid "help_street"
 msgstr ""
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr ""
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr ""
 
@@ -675,6 +683,10 @@ msgstr ""
 msgid "help_zip"
 msgstr ""
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr ""
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -706,17 +718,17 @@ msgid "label_accept"
 msgstr ""
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr ""
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr ""
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr ""
 
@@ -726,136 +738,136 @@ msgid "label_alternative_delivery"
 msgstr ""
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr ""
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr ""
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr ""
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr ""
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr ""
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr ""
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr ""
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr ""
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr ""
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr ""
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr ""
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr ""
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr ""
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr ""
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr ""
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr ""
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr ""
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr ""
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr ""
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr ""
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr ""
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr ""
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr ""
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr ""
 
@@ -865,241 +877,241 @@ msgid "label_gender"
 msgstr ""
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr ""
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr ""
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr ""
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr ""
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr ""
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr ""
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr ""
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 msgid "label_item_display_gross"
 msgstr ""
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr ""
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr ""
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr ""
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 msgid "label_item_notification_text"
 msgstr ""
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr ""
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr ""
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 msgid "label_item_overbook_notification_text"
 msgstr ""
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr ""
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr ""
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr ""
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr ""
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr ""
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr ""
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr ""
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr ""
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 msgid "label_phone"
 msgstr ""
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr ""
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr ""
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr ""
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr ""
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr ""
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr ""
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr ""
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr ""
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr ""
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr ""
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr ""
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr ""
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr ""
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr ""
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr ""
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 msgid "label_zip"
 msgstr ""
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr ""
 
@@ -1153,13 +1165,8 @@ msgstr ""
 msgid "my_orders"
 msgstr ""
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr ""
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr ""
 
@@ -1199,7 +1206,7 @@ msgid "not_available_yet_title"
 msgstr ""
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr ""
 
@@ -1244,17 +1251,17 @@ msgid "overbook_available_title"
 msgstr ""
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr ""
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr ""
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr ""
 
@@ -1264,7 +1271,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr ""
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr ""
 
@@ -1309,26 +1316,21 @@ msgid "shop_portlet"
 msgstr ""
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr ""
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr ""
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr ""
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr ""
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr ""
diff --git a/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po
index 307d475e..9c372b71 100644
--- a/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po
@@ -16,7 +16,7 @@ msgstr ""
 "X-Is-Fallback-For: de-at de-li de-lu de-ch de-de\n"
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr "Australische Dollar"
 
@@ -29,27 +29,27 @@ msgid "Activate vendor area on this context"
 msgstr "Aktiviert Mandantenbereich für diesen Kontext"
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr "Artikel"
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr "Kanadische Dollar"
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr "Schweizer Franken"
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr "Warenkorb"
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr "Dänische Krone"
 
@@ -70,7 +70,7 @@ msgid "Disables Buyable"
 msgstr "Deaktiviere Shop Artikel"
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr "Euro"
 
@@ -83,37 +83,37 @@ msgid "Enable Vendor Area"
 msgstr "Aktiviere Mandantenbereich"
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr "Britische Pfund"
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr "Indischer Rupie"
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr "Rechnung"
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr "Norwegische Krone"
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr "Neuseeländischer Dollar"
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr "Bezahlung"
 
@@ -126,12 +126,12 @@ msgid "Personal Preferences"
 msgstr "Meine Einstellungen"
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr "Schwedische Krone"
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr "Versand"
 
@@ -140,15 +140,23 @@ msgstr "Versand"
 msgid "Shop settings"
 msgstr "Shop-Einstellungen"
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr "Steuern"
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr "US-Dollar"
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -174,12 +182,13 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr "Japanischer Yen"
 
 #. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr "hinzufügen"
 
@@ -189,22 +198,22 @@ msgid "administration"
 msgstr "Administration"
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr "Nicht länger verfügbar. Bitte aus dem Warenkorb entfernen"
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr "${exceed} ${quantity_unit} zu viel im Warenkorb"
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr "${reserved} ${quantity_unit} reserviert"
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr "Teilweise reserviert"
 
@@ -273,7 +282,8 @@ msgid "centimeter"
 msgstr "Zentimeter"
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr "Zusatz"
 
@@ -332,6 +342,10 @@ msgstr "Shop Artikel Information hinzugefügt"
 msgid "enabled_vendor"
 msgstr "Mandant aktiviert."
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr "exkl."
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -407,23 +421,18 @@ msgstr "Artikel verfügbar"
 msgid "gram"
 msgstr "Gramm"
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr "Brutto"
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr "Bitte anhaken, wenn Sie die AGBs gelesen und akzeptiert haben."
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr "Absender-Adresse des Shops"
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr "Absender-Name des Shops"
 
@@ -433,12 +442,12 @@ msgid "help_alternative_delivery"
 msgstr "Lieferadresse weicht von Rechnungsadresse ab."
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr "Verfügbare Bezahlmethoden"
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr "Verfügbare Versandarten für Bestellungen"
 
@@ -455,32 +464,32 @@ msgid "help_country"
 msgstr ""
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr "Wählen sie die Shop-Währung"
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr "Shop-Administrator wird benachrichtigt, wenn Lagerbestand niedriger als definierter Schwellenwert ist."
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr "Einheit"
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr "Sind Artikel im Warenkorb standardmäßig versendbar? Downloads z.B. sind es nicht"
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr "Wählen Sie den Standard-Umsatzsteuersatz"
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr "Kein Limit für die Gesamtanzahl an Artikeln im Warenkorb"
 
@@ -490,12 +499,12 @@ msgid "help_firstname"
 msgstr "Geben Sie hier Ihren Vornamen an."
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr "Fixbetrag Versandkosten Netto"
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr "Versandkosten entfallen, wenn der Warenwert im Warenkorb dieses Limit übersteigt. Ob dieses Limit vom Netto- oder Bruttowarenwert gilt, hängt von der 'Berechnung Limit kostenfreier Versand vom Bruttowarenwert' Einstellung ab"
 
@@ -504,92 +513,92 @@ msgid "help_gender"
 msgstr ""
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr "Global Trade Item Number (GTIN), mit der Produkte und Packstücke weltweit eindeutig identifiziert werden können"
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr "Warenkorb nicht anzeigen, wenn keine Artikel enthalten"
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr "Bank des Rechnungsstellers (BIC)"
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr "Stadt des Rechnungsstellers"
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr "Firmenname des Rechnungsstellers"
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr "Optionale Zeile unter dem Firmennamen des Rechnungsstellers"
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr "Land des Rechnungsstellers"
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr "Optionale E-Mail-Adresse des Rechnungsstellers"
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr "Vorname des Rechnungsstellers"
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr "Bankkonto des Rechnungsstellers (IBAN)"
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr "Nachname des Rechnungsstellers"
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr "Optionale Telefonnummer des Rechnungsstellers"
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr "Straße des Rechnungsstellers"
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr "Optionale Web-Adresse des Rechnungsstellers"
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr "Postleitzahl des Rechnungsstellers"
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr "Zeige Preis inklusive Steuern"
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr "Produktnummer für diesen Artikel"
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr "Versandkosten pro Artikel im Warenkorb Netto. Wenn ein Fixbetrag definiert ist und Artikelversandkosten niedriger sind als der Fixbetrag, wird der Fixbetrag verwendet"
 
@@ -599,12 +608,12 @@ msgid "help_lastname"
 msgstr "Gebe Sie hier Ihren Nachnamen an."
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr "Maximale Anzahl an Artikeln im Warenkorb, wenn Gesamtbeschränkung im Warenkorb aktiviert"
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr "Standard-Bezahlmethode"
 
@@ -613,44 +622,44 @@ msgid "help_phone"
 msgstr ""
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr "Einheit in welcher die Artikel bemessen sind."
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr "Markieren, wenn dieser Artikel kostenfrei versandt wird"
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr "Artikel versendbar? Downloads z.B. sind es nicht"
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr "Wenn nicht gesetzt, wird das Limit für den kostenfreien Versand vom Nettowarenwert berechnet."
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr "Wählen sie die Standard Versandart für Bestellungen"
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr "Umsatzsteuer die zur Berechnung der Versandkosten verwendet wird"
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr "Soll ein direkter Link zur Kasse im Warenkorb angezeigt werden?"
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr "Soll die Währung im Warenkorb angezeigt werden?"
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr "Soll der Link zur Warenkorbübersicht im Warenkorb angezeigt werden?"
 
@@ -659,12 +668,12 @@ msgid "help_street"
 msgstr ""
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr "Zeige nur Gesamtsumme in der Warenkorbübersicht?"
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr "Verfügbare Umsatzsteuersätze"
 
@@ -672,6 +681,10 @@ msgstr "Verfügbare Umsatzsteuersätze"
 msgid "help_zip"
 msgstr ""
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr "inkl."
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -704,17 +717,17 @@ msgid "label_accept"
 msgstr "Bestätigen Sie die Allgemeinen Geschäftsbedingungen"
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr "Neuen Benutzern automatisch die Rolle Customer zuweisen"
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr "Admin E-Mail"
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr "Name Shop Administrator"
 
@@ -724,136 +737,136 @@ msgid "label_alternative_delivery"
 msgstr "Alternative Lieferadresse"
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr "Verfügbare Bezahlmethoden"
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr "Verfügbare Versandarten"
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr "BIC"
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr "Verkaufszeitraum Start"
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr "Verkaufszeitraum Ende"
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr "Bruttokosten bei Bezahlart 'Nachnahme'"
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr "Stadt"
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr "Firma"
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr "Firma (Zusatz)"
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr "Land"
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr "Währung"
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr "Mengenbeschränkung für einen Artikel im Warenkorb"
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr "Kommentare standardmäßig erlaubt"
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr "Kommentare standardmäßig erforderlich"
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr "Zeige Brutto standardmäßig aktiviert"
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr "Vorgabewert Nettopreis"
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr "Einheit als Gleitkommazahl standardmäßig aktiviert"
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr "Artikel Lagerbestand Warnung Schwellenwert"
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr "Vorgabewert Einheit"
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr "Artikel standardmäßig versendbar"
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr "Vorgabewert Umsatzsteuer"
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr "Keine Gesamtbeschränkung der Artikel im Warenkorb"
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr "E-Mail-Adresse"
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr "Vorname"
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr "Fixbetrag Versandkosten"
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr "Limit kostenfreier Versand"
 
@@ -863,243 +876,243 @@ msgid "label_gender"
 msgstr "Geschlecht"
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr "GTIN"
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr "Leeren Warenkorb nicht anzeigen"
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr "IBAN"
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr "Verfügbar"
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr "Maximale Anzahl dieses Artikels im Warenkorb"
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr "Zusatzinformation eingeben"
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr "Zusatzinformation Eingabe erforderlich"
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 msgid "label_item_display_gross"
 msgstr "Zeige Preis in Brutto"
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr "Zeige Verfügbarkeit"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr "Zusätzlicher allgemeiner Benachrichtigungstext für diesen Artikel in der Bestätigungsmail"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr "Zusätzlicher allgemeiner Benachrichtigungstext für diesen Artikel in der Bestätigungsmail, wenn Artikel vergriffen"
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr "Nettopreis"
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 msgid "label_item_notification_text"
 msgstr "Benachrichtigungstext für diesen Artikel in der Bestätigungsmail "
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr "Artikelnummer"
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr "Überbuchen"
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 msgid "label_item_overbook_notification_text"
 msgstr "Benachrichtigungstext für diesen Artikel im Benachrichtungungsmail, wenn dieser vergriffen ist"
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr "Einheit"
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr "Dezimaleingabe bei Anzahl erlaubt"
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr "Versandkosten pro Artikel"
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr "Artikel Lagerbestand Warnung Schwellenwert"
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr "Umsatzsteuer (in %)"
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr "Nachname"
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr "Maximale Anzahl Artikel im Warenkorb"
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr "Standard-Bezahlmethode"
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr "Benachrichtigungstext für Zahlungsart"
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 #, fuzzy
 msgid "label_phone"
 msgstr "Telefon"
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr "Verfügbare Mengeneinheiten"
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr "Gratis-Versand"
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr "Artikel versendbar"
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr "Gewicht"
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr "Schwellenwertberechnung für kostenfreien Versand vom Bruttowarenwert"
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr "Standard-Versandart"
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr "Umsatzsteuer für Versandkosten"
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr "Direkten Link zur Kasse im Warenkorb-Portlet anzeigen"
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr "Zeige Währungssymbol"
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr "Zeige Link zu Warenkorb im Warenkorb-Portlet an"
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr "Allgemeiner Benachrichtigungstext für Bestätigungsmail"
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr "Allgemeiner Benachrichtigungstext für Bestätigungsmail, wenn Warenkorb vergriffene Artikel enthält"
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr "Benachrichtigungstext für Bestätigungsmail für Artikel im Warenkorb"
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr "Benachrichtigungstext für Bestätigungsmail für vergriffene Artikel im Warenkorb"
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr "Nicht zur Bezahlung weiterleiten, wenn Reservierungen im Warenkorb"
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr "Straße"
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr "Zeige nur Gesamtbetrag in Warenkorb"
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr "Umsatzsteuer in %"
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr "Web-Adresse"
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 #, fuzzy
 msgid "label_zip"
 msgstr "Postleitzahl"
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr "Sprache"
 
@@ -1153,13 +1166,8 @@ msgstr "Milliliter"
 msgid "my_orders"
 msgstr "Meine Bestellungen"
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr "Netto"
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr "Nein"
 
@@ -1199,7 +1207,7 @@ msgid "not_available_yet_title"
 msgstr "Artikel ist noch nicht erhältlich"
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr "Text"
 
@@ -1244,17 +1252,17 @@ msgid "overbook_available_title"
 msgstr "Vorbestellungen verfügbar"
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr "Text"
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr "Zahlung"
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr "Text"
 
@@ -1264,7 +1272,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr "Keine Berechtigung um ${title} zu kaufen."
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr "Preis"
 
@@ -1309,26 +1317,21 @@ msgid "shop_portlet"
 msgstr "Shop"
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr "Zeichen"
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr "Text"
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr "aktualisieren"
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr "MwSt."
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr "Ja"
diff --git a/src/bda/plone/shop/locales/en/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/en/LC_MESSAGES/bda.plone.shop.po
index ac553c6c..4ad179b8 100644
--- a/src/bda/plone/shop/locales/en/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/en/LC_MESSAGES/bda.plone.shop.po
@@ -15,7 +15,7 @@ msgstr ""
 "Domain: bda.plone.shop\n"
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr "Australian Dollar"
 
@@ -28,27 +28,27 @@ msgid "Activate vendor area on this context"
 msgstr "Activate vendor area on this context"
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr "Article"
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr "Canadian Dollar"
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr "Swiss Franc"
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr "Cart"
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr "Danish Krone"
 
@@ -69,7 +69,7 @@ msgid "Disables Buyable"
 msgstr "Disables Buyable"
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr "Euro"
 
@@ -82,37 +82,37 @@ msgid "Enable Vendor Area"
 msgstr "Enable Vendor Area"
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr "British Pound Sterling"
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr "Indian Rupee"
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr ""
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr "Norwegian Krone"
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr "New Zealand Dollar"
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr "Notifications"
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr "Payment"
 
@@ -125,12 +125,12 @@ msgid "Personal Preferences"
 msgstr "Personal Preferences"
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr "Swedish Krona"
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr "Shipping"
 
@@ -139,15 +139,23 @@ msgstr "Shipping"
 msgid "Shop settings"
 msgstr "Shop settings"
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr "Tax Settings"
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr "US Dollar"
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -173,12 +181,13 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr "Japanese Yen"
 
 #. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr "add to cart"
 
@@ -188,22 +197,22 @@ msgid "administration"
 msgstr ""
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr "No longer available, please remove from cart"
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr "Limit exceed by ${exceed} ${quantity_unit}"
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr "${reserved} ${quantity_unit} reserved"
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr "Partly reserved"
 
@@ -272,7 +281,8 @@ msgid "centimeter"
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr "Comment"
 
@@ -331,6 +341,10 @@ msgstr "Enabled Buyable."
 msgid "enabled_vendor"
 msgstr "Enabled Vendor."
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr ""
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -406,23 +420,18 @@ msgstr "Item available"
 msgid "gram"
 msgstr ""
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr "Gross"
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr "No typos please...."
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr "Name used for Shop E-Mails."
 
@@ -432,12 +441,12 @@ msgid "help_alternative_delivery"
 msgstr "Delivery address is different from billing address."
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr "Available payment methods in checkout"
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr "Available shipping methods in checkout"
 
@@ -454,32 +463,32 @@ msgid "help_country"
 msgstr ""
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr "Choose the default currency"
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr "default measurement"
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr "Flag whether item is shippable by default, i.e. downloads are not"
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr "Specify default vat name"
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr "No total number of items in cart limit"
 
@@ -489,12 +498,12 @@ msgid "help_firstname"
 msgstr "Fill in your given name."
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr "Net flat shipping cost"
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
 
@@ -503,92 +512,92 @@ msgid "help_gender"
 msgstr ""
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr "Global Trade Item Number"
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr "Hide cart if no items contained"
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr ""
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr ""
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr ""
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr ""
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr ""
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr ""
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr ""
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr ""
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr ""
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr ""
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr ""
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr ""
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr ""
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr ""
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr "Buyable Item number"
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
 
@@ -598,12 +607,12 @@ msgid "help_lastname"
 msgstr "Fill in your surname or your family name."
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr "Maximum number of articles in cart if disable max article flag set"
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr "Default payment method in checkout"
 
@@ -612,44 +621,44 @@ msgid "help_phone"
 msgstr ""
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr "Quantity units (what the buyable items are measured in)"
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr "Flag whether item is shippable, i.e. downloads are not"
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr "If set to False, shipping limit gets calculated from net price instead of gross."
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr "Shipping method"
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr "VAT used to calculate shipping costs"
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr "Show Checkout link"
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr "Show currency in cart"
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr "Show cart link"
 
@@ -658,12 +667,12 @@ msgid "help_street"
 msgstr ""
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr "Show only total value in cart summary"
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr "Specify all allowed vat settings"
 
@@ -671,6 +680,10 @@ msgstr "Specify all allowed vat settings"
 msgid "help_zip"
 msgstr ""
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr ""
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -703,17 +716,17 @@ msgid "label_accept"
 msgstr "Accept terms of use"
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr "Add Customer role to new Users"
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr "Shop Admin E-Mail"
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr "Shop Admin Name"
 
@@ -723,136 +736,136 @@ msgid "label_alternative_delivery"
 msgstr "Alternative delivery address"
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr "Available Payment Methods"
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr "Available Shipping Methods"
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr ""
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr "Buyable effective date"
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr "Buyable expiration date"
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr "Cash on delivery costs in gross"
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr "City"
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr "Company"
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr ""
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr "Country"
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr "Currency"
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr "Quantity limit of an item in the cart."
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr "Comment enabled by default"
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr "Comment required by default"
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr "Display Gross by default"
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr "Default Item net price"
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr "Quantity as float as default"
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr "Specify default quantity name."
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr "Item Shippable by default"
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr "Default Value added tax name"
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr "Disable max article"
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr ""
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr "First name"
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr "Flat shipping cost"
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr "Free Shipping Limit"
 
@@ -862,243 +875,243 @@ msgid "label_gender"
 msgstr "Gender"
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr "GTIN"
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr "Hide Cart if empty"
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr ""
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr "Item stock available"
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr "Max count of this item in cart"
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr "Comment enabled"
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr "Comment required"
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 msgid "label_item_display_gross"
 msgstr "Display Gross Price"
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr "Display item stock"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr "Additional overall notification text for the order confirmation mail of this item"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr "Item net price"
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 msgid "label_item_notification_text"
 msgstr "Notification text for this item in the order confirmation mail"
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr "Item number"
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr "Item stock overbook"
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 msgid "label_item_overbook_notification_text"
 msgstr "Notification text for this item in the order confirmation mail if item is out of stock"
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr "Quantity unit"
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr "Quantity as float"
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr "Item shipping cost"
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr "Item VAT (in %)"
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr "Last name"
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr "Maximum number articles in cart"
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr "Payment Method"
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr "Payment Texts"
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 #, fuzzy
 msgid "label_phone"
 msgstr "Phone"
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr "Specify quantity units allowed in shop."
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr "Item Shippable"
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr "Item Weight"
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr "Calculate shipping limit from gross"
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr "Shipping Method"
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr "Shipping VAT"
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr "Show checkout link in portlet"
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr "Show the currency for items"
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr "Show link to cart in portlet"
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr "Overall notification text for order confirmation mail"
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr "Overall notification text for order confirmation mail if order contains items out of stock"
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr "Default notification text for items in order confirmation mail"
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr "Default notification text for items in order confirmation mail if item out of stock."
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr "Skip Payment if order contains reservations"
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr "Street"
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr "Cart Summary total only"
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr "VAT in %"
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr ""
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 #, fuzzy
 msgid "label_zip"
 msgstr "Postal Code"
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr "Language"
 
@@ -1152,13 +1165,8 @@ msgstr ""
 msgid "my_orders"
 msgstr "My Orders"
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr "Net"
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr "No"
 
@@ -1198,7 +1206,7 @@ msgid "not_available_yet_title"
 msgstr "Item not available yet."
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr "Order Text"
 
@@ -1243,17 +1251,17 @@ msgid "overbook_available_title"
 msgstr "Pre-order available"
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr "Overbook Text"
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr "Payment"
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr "Payment Text"
 
@@ -1263,7 +1271,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr "Permission to buy ${title} not granted."
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr "Price"
 
@@ -1308,26 +1316,21 @@ msgid "shop_portlet"
 msgstr "Shop Portlet"
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr "Symbol"
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr "Text"
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr "update cart"
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr "Vat"
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr "Yes"
diff --git a/src/bda/plone/shop/locales/fr/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/fr/LC_MESSAGES/bda.plone.shop.po
index 11bfe574..6b7eb7eb 100644
--- a/src/bda/plone/shop/locales/fr/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/fr/LC_MESSAGES/bda.plone.shop.po
@@ -16,7 +16,7 @@ msgstr ""
 "X-Is-Fallback-For: fr-be fr-ca fr-lu fr-mc fr-ch fr-fr\n"
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr ""
 
@@ -29,27 +29,27 @@ msgid "Activate vendor area on this context"
 msgstr "Active l'espace vendeur sur ce contexte"
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr "Article"
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr ""
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr ""
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr "Panier"
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr ""
 
@@ -70,7 +70,7 @@ msgid "Disables Buyable"
 msgstr "Déactiver information des produits dans le shop"
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr ""
 
@@ -83,37 +83,37 @@ msgid "Enable Vendor Area"
 msgstr "Activer l'espace vendeur"
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr ""
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr ""
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr ""
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr ""
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr ""
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr "Notifications"
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr "Paiement"
 
@@ -126,12 +126,12 @@ msgid "Personal Preferences"
 msgstr "Préférences personnelles"
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr ""
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr "Livraison"
 
@@ -140,15 +140,23 @@ msgstr "Livraison"
 msgid "Shop settings"
 msgstr "Réglages du magasin"
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr "Réglages des taxes"
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr ""
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -174,12 +182,13 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr ""
 
 #. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr "Ajouter"
 
@@ -189,22 +198,22 @@ msgid "administration"
 msgstr "Administration"
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr "N'est plus disponible, merci de retirer du panier"
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr "Limite dépassée de ${exceed} ${quantity_unit}"
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr "${reserved} ${quantity_unit} réservé(s)"
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr "Partiellement réservé"
 
@@ -273,7 +282,8 @@ msgid "centimeter"
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr "Complément"
 
@@ -332,6 +342,10 @@ msgstr "Activer information des articles dans le shop"
 msgid "enabled_vendor"
 msgstr "Activer vendeur"
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr ""
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -407,23 +421,18 @@ msgstr "Article disponible"
 msgid "gram"
 msgstr ""
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr "TTC"
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr "Cochez cette case pour indiquer avoir trouvé, lu et accepté les conditions d'utilisation de ce site."
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr "Pas de faute de frappe s'il vous plaît..."
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr "Nom utilisé pour les emails du magasin"
 
@@ -433,12 +442,12 @@ msgid "help_alternative_delivery"
 msgstr "L'adresse de livraison est différente de l'adresse de facturation"
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr "Méthodes de paiement disponibles à la commande"
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr "Méthode d'expédition disponibles à la commande"
 
@@ -455,32 +464,32 @@ msgid "help_country"
 msgstr ""
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr "Choisissez la monnaie par défaut"
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr "L'administrateur du magasin sera notifié si le stock est inférieur au seuil spécifié."
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr "Mesure par défaut"
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr "Indiquer si l'article est expédiable par défaut, par exemple, les téléchargements ne le sont pas."
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr "Spécifier le nom de la TVA"
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr "Pas de limite sur le nombre total d'articles dans le panier"
 
@@ -490,12 +499,12 @@ msgid "help_firstname"
 msgstr "Remplissez votre prénom"
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr "Frais de port HT"
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr "N'ajoutez pas les frais de port aux commandes dont le prix est supérieur à la limite. Si la limite s'applique au prix d'achat TTC ou HT dépend du paramètre «Calculer la limite d'expédition à partir du TTC»"
 
@@ -504,92 +513,92 @@ msgid "help_gender"
 msgstr ""
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr "Code d'article international"
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr "Cacher le panier s'il est vide"
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr ""
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr ""
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr ""
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr ""
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr ""
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr ""
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr ""
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr ""
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr ""
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr ""
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr ""
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr ""
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr ""
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr "Afficher les prix TTC"
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr "Numérot d'article"
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr "Frais de port HT par article dans le panier. Si le coût d'expédition forfaitaire est défini et que le coût d'expédition d'article est plus bas, le coût d'expédition forfaitaire est employé"
 
@@ -599,12 +608,12 @@ msgid "help_lastname"
 msgstr "Remplissez votre nom de famille"
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr "Nombre maximum d'articles dans le panier"
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr "Méthode de paiement par défaut à la commande"
 
@@ -613,44 +622,44 @@ msgid "help_phone"
 msgstr ""
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr "Unités de quantité (unité de mesure des articles)"
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr "Indique si l'expédition de cet articles est gratuite"
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr "Indique si l'article est expédiable, p. ex. les téléchargements ne le sont pas"
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr "Si défini à faux, la limite d'expédition est calculée sur le prix HT au lieu de TTC."
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr "Méthode de livraison par défaut à la commande"
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr "TVA utiéisée pour calculer les frais de port"
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr ""
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr ""
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr ""
 
@@ -659,12 +668,12 @@ msgid "help_street"
 msgstr ""
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr "Ne motre que le montant total dans le résumé du panier"
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr "Sépcifier toutes les TVA autorisées"
 
@@ -672,6 +681,10 @@ msgstr "Sépcifier toutes les TVA autorisées"
 msgid "help_zip"
 msgstr ""
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr ""
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -704,17 +717,17 @@ msgid "label_accept"
 msgstr "Accepter les conditions d'utilisation"
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr "Ajouter le rôle Client aux nouveaux utilisateurs"
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr "Email de l'administrateur du magasin"
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr "Nom de l'administrateur du magasin"
 
@@ -724,136 +737,136 @@ msgid "label_alternative_delivery"
 msgstr "Adresse de livraison alternative"
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr "Modes de paiement disponibles"
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr "Modes de livraison disponibles"
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr ""
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr "Date de l'achetabilité"
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr "Expiration de l'achetabilité"
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr "Encaisse des frais de livraison TTC"
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr "Ville"
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr "Société"
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr ""
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr "Pays"
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr "Monnaie"
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr "Quantité limite d'un article dans le panier"
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr "Autoriser l'information complémentaire par défaut"
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr "Information complémentaire obligatoire par défaut"
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr "Afficher le prix TTC par défaut"
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr "Prix HT par défaut"
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr "Quantité comme flottant par défaut"
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr "Seuil d'alerte du stock"
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr "Spécifier le nom de la quantité par défaut"
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr "Article expédiable par défaut"
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr "Nom de la taxe par défaut"
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr "Désactiver maximum d'articles"
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr ""
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr "Prénom"
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr "Frais de port forfaitaire"
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr "Limit pour la livraison offerte"
 
@@ -863,243 +876,243 @@ msgid "label_gender"
 msgstr "Genre"
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr "GTIN"
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr "Cacher le panier si vide"
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr ""
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr "Disponible en stock"
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr "Nombre maximum de cet article dans le panier"
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr "Information complémentaire autorisée"
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr "Information complémentaire obligatoire"
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 msgid "label_item_display_gross"
 msgstr "Prix TTC"
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr "Afficher l'article dans le panier"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr "Texte supplémentaire général de notification pour l'email de confirmation de commande de cet article"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr "Texte supplémentaire général de notification pour l'email de confirmation de commande de cet article si rupture de stock"
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr "Prix HT"
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 msgid "label_item_notification_text"
 msgstr "Text de notification pour cet article dans l'email de confirmation de commande"
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr "Numéro d'article"
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr "Suprplus de stock d'article"
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 msgid "label_item_overbook_notification_text"
 msgstr "Text de notification pour cet article dans l'email de confirmation de commande si rupture de stock"
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr "Unité de quantité"
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr "Commande en fraction possible"
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr "Frais de port article"
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr "Seuil d'alerte du stock."
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr "Impôt sur le chiffre d'affaire (en %)"
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr "Nom de famille"
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr "Nombre maximum d'articles dans le panier"
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr "Mode de paiement"
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr "Texte du paiement"
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 #, fuzzy
 msgid "label_phone"
 msgstr "Téléphone"
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr "Spécifier les unités de quantités autorisées dans le magasin"
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr "Frais de port offerts"
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr "Article expédiable"
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr "Poids de l'article"
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr "Calculer la limite de livraison depuis TTC"
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr "Mode de livraison"
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr "TVA sur la livraison"
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr "Afficher le lien vers le check-out dans le portlet"
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr "Motre la monnaie pour les articles"
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr "Afficher le lien vers le panier dans le portlet"
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr "Texte de notification générale pour l'email de confirmation de commande"
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr "Texte de notification générale pour l'email de confirmation de commande si elle contient des articles en rupture de stock"
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr "Texte de notification par défaut pour les articles dans l'email de confirmation de commande"
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr "Texte de notification par défaut pour les articles dans l'email de confirmation de commande si rupture de stock"
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr "Passer l'étape de paiement si la commande contient des réservations"
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr "Rue"
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr "Uniquement le total résumé du panier"
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr "TVA en %"
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr ""
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 #, fuzzy
 msgid "label_zip"
 msgstr "Code postal"
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr "Langue"
 
@@ -1153,13 +1166,8 @@ msgstr ""
 msgid "my_orders"
 msgstr "Mes commandes"
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr "HT"
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr "Non"
 
@@ -1199,7 +1207,7 @@ msgid "not_available_yet_title"
 msgstr "Article pas encore disponible"
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr "Text de commande"
 
@@ -1244,17 +1252,17 @@ msgid "overbook_available_title"
 msgstr "Pré-commande possible"
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr "Texte de surréservation"
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr "Paiement"
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr "Texte de paiement"
 
@@ -1264,7 +1272,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr "Permission d'acheter ${title} non accordée."
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr "Prix"
 
@@ -1309,26 +1317,21 @@ msgid "shop_portlet"
 msgstr "Portlet Magasin"
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr "Symbole"
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr "Texte"
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr "Actualiser"
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr "TVA"
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr "Oui"
diff --git a/src/bda/plone/shop/locales/it/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/it/LC_MESSAGES/bda.plone.shop.po
index 450b086b..0c791294 100644
--- a/src/bda/plone/shop/locales/it/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/it/LC_MESSAGES/bda.plone.shop.po
@@ -16,7 +16,7 @@ msgstr ""
 "X-Is-Fallback-For: it-ch it-it\n"
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr ""
 
@@ -29,27 +29,27 @@ msgid "Activate vendor area on this context"
 msgstr ""
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr ""
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr ""
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr ""
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr ""
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr ""
 
@@ -70,7 +70,7 @@ msgid "Disables Buyable"
 msgstr "Disattiva le informazioni sull'articolo relative all'oggetto"
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr ""
 
@@ -83,37 +83,37 @@ msgid "Enable Vendor Area"
 msgstr ""
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr ""
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr ""
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr ""
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr ""
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr ""
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr ""
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr ""
 
@@ -126,12 +126,12 @@ msgid "Personal Preferences"
 msgstr ""
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr ""
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr ""
 
@@ -140,15 +140,23 @@ msgstr ""
 msgid "Shop settings"
 msgstr ""
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr ""
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr ""
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -174,12 +182,13 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr ""
 
 #. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr "Aggiungi"
 
@@ -189,22 +198,22 @@ msgid "administration"
 msgstr ""
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr ""
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr ""
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr ""
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr ""
 
@@ -273,7 +282,8 @@ msgid "centimeter"
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr "commento"
 
@@ -332,6 +342,10 @@ msgstr "Disattiva le informazioni sull'articolo"
 msgid "enabled_vendor"
 msgstr ""
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr ""
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -407,23 +421,18 @@ msgstr ""
 msgid "gram"
 msgstr ""
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr "Molto"
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr ""
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr ""
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr ""
 
@@ -433,12 +442,12 @@ msgid "help_alternative_delivery"
 msgstr ""
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr ""
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr ""
 
@@ -455,32 +464,32 @@ msgid "help_country"
 msgstr ""
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr ""
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr ""
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr ""
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr ""
 
@@ -490,12 +499,12 @@ msgid "help_firstname"
 msgstr ""
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr ""
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr ""
 
@@ -504,92 +513,92 @@ msgid "help_gender"
 msgstr ""
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr ""
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr ""
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr ""
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr ""
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr ""
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr ""
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr ""
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr ""
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr ""
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr ""
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr ""
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr ""
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr ""
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr ""
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr ""
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr ""
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr ""
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr ""
 
@@ -599,12 +608,12 @@ msgid "help_lastname"
 msgstr ""
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr ""
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr ""
 
@@ -613,44 +622,44 @@ msgid "help_phone"
 msgstr ""
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr ""
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr ""
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr ""
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr ""
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr ""
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr ""
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr ""
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr ""
 
@@ -659,12 +668,12 @@ msgid "help_street"
 msgstr ""
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr ""
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr ""
 
@@ -672,6 +681,10 @@ msgstr ""
 msgid "help_zip"
 msgstr ""
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr ""
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -703,17 +716,17 @@ msgid "label_accept"
 msgstr ""
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr ""
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr ""
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr ""
 
@@ -723,136 +736,136 @@ msgid "label_alternative_delivery"
 msgstr ""
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr ""
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr ""
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr ""
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr ""
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr ""
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr ""
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr ""
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr ""
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr ""
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr ""
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr ""
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr ""
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr ""
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr ""
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr ""
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr ""
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr ""
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr ""
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr ""
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr ""
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr ""
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr ""
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr ""
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr ""
 
@@ -862,241 +875,241 @@ msgid "label_gender"
 msgstr ""
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr ""
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr ""
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr ""
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr ""
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr ""
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr "Comment enabled"
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr "Comment required"
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 msgid "label_item_display_gross"
 msgstr ""
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr ""
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr ""
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr "Prezzo netto"
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 msgid "label_item_notification_text"
 msgstr ""
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr ""
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr ""
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 msgid "label_item_overbook_notification_text"
 msgstr ""
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr "Pezzo"
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr "Inserimento decimali nella quantitŕ > facoltativo"
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr ""
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr "IVA (in %)"
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr ""
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr ""
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr ""
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr ""
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 msgid "label_phone"
 msgstr ""
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr ""
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr ""
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr ""
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr ""
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr ""
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr ""
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr ""
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr ""
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr ""
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr ""
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr ""
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr ""
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr ""
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr ""
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr ""
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 msgid "label_zip"
 msgstr ""
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr ""
 
@@ -1150,13 +1163,8 @@ msgstr ""
 msgid "my_orders"
 msgstr ""
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr "Netto"
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr ""
 
@@ -1196,7 +1204,7 @@ msgid "not_available_yet_title"
 msgstr ""
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr ""
 
@@ -1241,17 +1249,17 @@ msgid "overbook_available_title"
 msgstr ""
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr ""
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr ""
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr ""
 
@@ -1261,7 +1269,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr ""
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr "Prezzo"
 
@@ -1306,26 +1314,21 @@ msgid "shop_portlet"
 msgstr ""
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr ""
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr ""
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr "Aggiorna"
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr "IVA"
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr ""
diff --git a/src/bda/plone/shop/locales/nl/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/nl/LC_MESSAGES/bda.plone.shop.po
index 742be11a..cf28094a 100644
--- a/src/bda/plone/shop/locales/nl/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/nl/LC_MESSAGES/bda.plone.shop.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Poedit 1.7.4\n"
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr "Australische Dollar"
 
@@ -30,27 +30,27 @@ msgid "Activate vendor area on this context"
 msgstr "Activeer leveranciersgebied voor deze context"
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr "Artikel"
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr "Canadese Dollar"
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr "Zwiterse Franken"
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr "Winkelwagen"
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr "Deense Kronen"
 
@@ -71,7 +71,7 @@ msgid "Disables Buyable"
 msgstr "Deactiveer Koopbaarheid"
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr "Euro"
 
@@ -84,37 +84,37 @@ msgid "Enable Vendor Area"
 msgstr "Activeer leveranciersgebied"
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr "Britse Pond"
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr "Indische Rupie"
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr ""
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr "Norweegse Kronen"
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr "Nieuwzeelandse Dollar"
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr "Meldingen"
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr "Betaling"
 
@@ -127,12 +127,12 @@ msgid "Personal Preferences"
 msgstr "Persoonlijke voorkeuren"
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr "Zweedse Kronen"
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr "Verzending"
 
@@ -141,15 +141,23 @@ msgstr "Verzending"
 msgid "Shop settings"
 msgstr "Winkelinstellingen"
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr "Belastinginstellingen"
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr "Amerikaanse Dollar"
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -175,12 +183,13 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr "Japanse Yen"
 
 #. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr "Aanschaffen"
 
@@ -190,22 +199,22 @@ msgid "administration"
 msgstr ""
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr "Niet langer verkrijgbaar, verwijder uit winkelwagen"
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr "${exceed} ${quantity_unit} Te veel artikelen in winkelwagen"
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr "${reserved} ${quantity_unit} gereserveerd"
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr "Gedeeltelijk gereserveerd"
 
@@ -274,7 +283,8 @@ msgid "centimeter"
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr "Reactie"
 
@@ -333,6 +343,10 @@ msgstr "Koopbaarheid geactiveerd"
 msgid "enabled_vendor"
 msgstr "Leverancier geactiveerd"
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr ""
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -408,23 +422,18 @@ msgstr "Artikel verkrijgbaar"
 msgid "gram"
 msgstr ""
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr "Bruto"
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr "Vink dit hokje aan wanneer je de algemene voorwaarden hebt gelezen en hebt geaccepteerd"
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr "Let op spelfouten"
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr "Naam voor de e-mails"
 
@@ -434,12 +443,12 @@ msgid "help_alternative_delivery"
 msgstr "Bezorgadres verschilt van factuuradres"
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr "Beschikbare betaalmethodes"
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr "Beschikbare verzendmogelijkheden"
 
@@ -456,32 +465,32 @@ msgid "help_country"
 msgstr "Land"
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr "Kies de valuta"
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr "Aantal"
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr "Geef aan of het artikel standaard verzending heeft, downloads e.d. niet"
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr "Specificeer de standaard BTW"
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr "Geen limiet aan het totaal aantal artikelen in de winkelwagen"
 
@@ -491,12 +500,12 @@ msgid "help_firstname"
 msgstr "Vul uw voornaam in"
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr "Vast bedrag netto verzendkosten"
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr "Voeg geen verzendkosten toe aan bestellingen met een hogere prijs dan het limiet. Of het limiet is berekend voor de netto of bruto verkoopprijs is afhankelijk van instellingen voor 'Bereken bruto verzendkosten'"
 
@@ -505,92 +514,92 @@ msgid "help_gender"
 msgstr "Geslacht"
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr "Global Trade Item Number, uniek nummer van een artikel"
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr "Verberg winkelwagen als deze leeg is"
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr ""
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr ""
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr ""
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr ""
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr ""
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr ""
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr ""
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr ""
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr ""
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr ""
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr ""
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr ""
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr ""
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr ""
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr "Productnummer voor dit artikel"
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr "Netto verzendkosten per artikel in winkelwagen. Als een vast bedrag voor verzendkosten is vastgesteld en het artikel kost minder dan de vaste verzendkosten, gebruik dan de vaste verzendkosten"
 
@@ -600,12 +609,12 @@ msgid "help_lastname"
 msgstr "Vul uw achternaam in"
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr "Maximaal aantal artikelen in winkelwagen wanneer de optie maximale artikelen is gedeactiveerd"
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr "Standaard betaalmethode in kassa"
 
@@ -614,44 +623,44 @@ msgid "help_phone"
 msgstr "Telefoon"
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr "Eenheid waar de artikelen in gemeten worden"
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr "Geef aan of het artikel verzendbaar is, downloads e.d. niet"
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr "Indien niet ingesteld, wordt het verzendingslimiet berekend voor de netto prijs in plaats van de bruto prijs"
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr "Standaard verzendmethode in kassa"
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr "BTW gebruikt om verzendkosten te berekenen"
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr "Directe link weergegeven in de kassa"
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr "Valuta weergegeven in de winkelwagen"
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr "De koppeling naar het winkelwagenoverzicht in de winkelwagen"
 
@@ -660,12 +669,12 @@ msgid "help_street"
 msgstr "Straat"
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr "Laat alleen totaalbedrag zien in het winkelwagenoverzicht"
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr "Specificeer alle toegestane BTW instellingen"
 
@@ -673,6 +682,10 @@ msgstr "Specificeer alle toegestane BTW instellingen"
 msgid "help_zip"
 msgstr "Postcode"
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr ""
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -705,17 +718,17 @@ msgid "label_accept"
 msgstr "Accepteer algemene voorwaarden"
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr "Geef nieuwe gebruikers de rol van consument"
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr "Winkel administratie e-mail"
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr "Naam winkel administratie"
 
@@ -725,136 +738,136 @@ msgid "label_alternative_delivery"
 msgstr "Alternatieve bezorgadressen"
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr "Beschikbare betaalmethodes"
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr "Beschikbare verzendmogelijkheden"
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr ""
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr "Begindatum Koopbaarheid"
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr "Einddatum Koopbaarheid"
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr "Rembours verzendkosten betalen in bruto"
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr "Stad"
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr "Bedrijf"
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr ""
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr "Land"
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr "Valuta"
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr "Aantallimiet voor een artikel in de winkelwagen"
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr "Reacties standaard toegestaan"
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr "Reacties standaard vereist"
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr "Toon bruto standaard"
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr "Standaard netto prijs van artikel"
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr "Voorgesteld standaard eenheid"
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr "Specificeer naam van standaard eenheid"
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr "Artikel standaard verzendbaar"
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr "Standaard waarde toegevoegd BTW"
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr "Deactiveer maximaal aantal artikelen"
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr ""
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr "Voornaam"
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr "Vast bedrag verzendkosten"
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr "Limiet gratis verzending"
 
@@ -864,243 +877,243 @@ msgid "label_gender"
 msgstr "Geslacht"
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr "GTIN"
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr "Verberg lege winkelwagen"
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr ""
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr "Artikel is verkrijgbaar"
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr "Maximaal aantal van dit artikel in de winkelwagen"
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr "Reactie geactiveerd"
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr "Reactie vereist"
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 msgid "label_item_display_gross"
 msgstr "Toon bruto prijs"
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr "Toon beschikbaarheid artikel"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr "Bevestigingsmail met aanvullende informatie over dit artikel in de winkelwagen"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr "Bevestigingsmail met aanvullende informatie over dit artikel in de winkelwagen als het artikel uitverkocht is"
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr "Artikel netto prijs"
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 msgid "label_item_notification_text"
 msgstr "Meldingstekst voor dit artikel in bevestigingsmail"
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr "Artikelnummer"
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr "Artikel voorraad is overboekt"
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 msgid "label_item_overbook_notification_text"
 msgstr "Algemeen bericht voor de bevestigingsmail als het artikel uitverkocht is"
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr "Eenheid"
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr "Decimalen toegestaan"
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr "Verzendkosten per artikel"
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr "BTW (in %)"
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr "Achternaam"
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr "Maximaal aantal artikelen in winkelwagen"
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr "Betaalmethode"
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr "Bericht na betaling"
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 #, fuzzy
 msgid "label_phone"
 msgstr "Telefoon"
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr "De toegestane hoeveelheid eenheden in de winkel"
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr "Artikel verzendbaar"
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr "Gewicht artikel"
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr "Bereken bruto verzendinglimiet "
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr "Verzendingmethode"
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr "BTW verzending"
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr "Toon link naar kassa in portlet"
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr "Toon de valuta voor artikelen"
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr "Toon link naar winkelwagen in portlet"
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr "Algemeen bericht voor bevestigingsmail"
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr "Algemeen bericht voor bevestigingsmail als de bestelling artikelen bevat die uitverkocht zijn"
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr "Standaard bericht voor de bevestigingsmail van bestelde artikelen "
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr "Standaard bericht voor de bevestigingsmail als het artikel uitverkocht is"
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr "Sla betaling over als de bestelling gereserveerd is"
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr "Straat"
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr "Winkelwagenoverzicht totaal"
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr "BTW in %"
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr ""
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 #, fuzzy
 msgid "label_zip"
 msgstr "Postcode"
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr "Taal"
 
@@ -1154,13 +1167,8 @@ msgstr ""
 msgid "my_orders"
 msgstr "Mijn bestellingen"
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr "Netto"
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr "Nee"
 
@@ -1200,7 +1208,7 @@ msgid "not_available_yet_title"
 msgstr "Artikel is nog niet verkrijgbaar"
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr "Bestelling tekst"
 
@@ -1245,17 +1253,17 @@ msgid "overbook_available_title"
 msgstr "Voorbestellen beschikbaar"
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr "Overboeken tekst"
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr "Betaling"
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr "Betaling tekst"
 
@@ -1265,7 +1273,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr "Geen toestemming om ${title} te kopen."
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr "Prijs"
 
@@ -1310,26 +1318,21 @@ msgid "shop_portlet"
 msgstr "Winkel portlet"
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr "Symbool"
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr "Tekst"
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr "Updaten winkelwagen"
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr "BTW"
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr "Ja"
diff --git a/src/bda/plone/shop/locales/nn/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/nn/LC_MESSAGES/bda.plone.shop.po
index 1172dfd7..e675d789 100644
--- a/src/bda/plone/shop/locales/nn/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/nn/LC_MESSAGES/bda.plone.shop.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.7\n"
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr ""
 
@@ -30,27 +30,27 @@ msgid "Activate vendor area on this context"
 msgstr ""
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr "Produkt"
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr ""
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr ""
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr ""
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgid "Disables Buyable"
 msgstr "Slett"
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr ""
 
@@ -84,37 +84,37 @@ msgid "Enable Vendor Area"
 msgstr ""
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr ""
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr ""
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr ""
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr ""
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr ""
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr "Tilleggsinformasjon"
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr "Betaling"
 
@@ -127,12 +127,12 @@ msgid "Personal Preferences"
 msgstr "Personlege detaljar"
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr ""
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr "frakt"
 
@@ -141,15 +141,23 @@ msgstr "frakt"
 msgid "Shop settings"
 msgstr "Butikk oppset"
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr "Mva oppsett"
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr ""
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -175,12 +183,13 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr ""
 
 #. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr "Legg i handlekorg"
 
@@ -190,22 +199,22 @@ msgid "administration"
 msgstr ""
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr "Utseld"
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr "For mange produkt"
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr ""
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr ""
 
@@ -274,7 +283,8 @@ msgid "centimeter"
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr "Kommentar"
 
@@ -333,6 +343,10 @@ msgstr "Tilleggsinformasjon"
 msgid "enabled_vendor"
 msgstr ""
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr ""
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -408,23 +422,18 @@ msgstr "På lager "
 msgid "gram"
 msgstr ""
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr "Brutto"
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr ""
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr ""
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr ""
 
@@ -434,12 +443,12 @@ msgid "help_alternative_delivery"
 msgstr "Hjelp alternativ levering"
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr "hjelp mogelege betalingsmåtar"
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr "hjelp moglege fraktalternativ"
 
@@ -456,32 +465,32 @@ msgid "help_country"
 msgstr "hjelp land"
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr "hjelp valuta"
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr "hjelp standard antal "
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr "hjelp standard fraktmetode"
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr "hjelp standard mva "
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr "hjelp maks tal produkt"
 
@@ -491,12 +500,12 @@ msgid "help_firstname"
 msgstr "hjelp førenamn"
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr "hjelp standard fraktkostnader"
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr "hjelp fri frakt grense"
 
@@ -505,92 +514,92 @@ msgid "help_gender"
 msgstr ""
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr ""
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr "hejlp skjul felt om tomt"
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr ""
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr ""
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr ""
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr ""
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr ""
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr ""
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr ""
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr ""
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr ""
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr ""
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr ""
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr ""
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr ""
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr ""
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr "hjelp produktnr."
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr "hjelp produkt fraktkostnader"
 
@@ -600,12 +609,12 @@ msgid "help_lastname"
 msgstr "hjelp etternamn"
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr "hjelp maks produkt"
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr "hjelp betalingsmetode"
 
@@ -614,44 +623,44 @@ msgid "help_phone"
 msgstr "hjelp telefon"
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr "hjelp antal varer"
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr "hjelp fraktalternativ"
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr ""
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr "Hjelp fraktmetode"
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr "hjelp moms på frakt"
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr "hjelp, vis gå til betaling"
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr "hjelp vis valuta"
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr "hjelp vis skjema"
 
@@ -660,12 +669,12 @@ msgid "help_street"
 msgstr "hjelp gateadresse"
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr "hjelp oppsumert totalt"
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr "hjelp mva"
 
@@ -673,6 +682,10 @@ msgstr "hjelp mva"
 msgid "help_zip"
 msgstr "hjelp zip."
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr ""
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -705,17 +718,17 @@ msgid "label_accept"
 msgstr "etikett akseptert"
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr ""
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr "etikett administrator epost"
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr "etikett administrator navn"
 
@@ -725,136 +738,136 @@ msgid "label_alternative_delivery"
 msgstr "etikett alternativ levering"
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr "etikett tilgelege betalingsmåtar"
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr "etikett tilgjengelege fraktmetodar"
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr ""
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr "etikett "
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr "etikett til sals best før dato"
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr "etikett betaling ved henting"
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr "etikett by"
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr "etikett firma"
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr ""
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr "etikett land"
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr "etikett valuta"
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr ""
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr ""
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr ""
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr "etikett standard produkt vises brutto"
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr "etikett standard produkt netto"
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr "etikett standard antal "
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr "etikett standard antal produkt"
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr "etikett standard frakt produkt sendbart"
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr "etikett standard mva"
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr "etikett avbrutt maks produkter"
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr ""
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr "etikett førenamn"
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr "etikett standard fraktkostnader"
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr "etikett fraktfritt grense"
 
@@ -864,245 +877,245 @@ msgid "label_gender"
 msgstr ""
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr ""
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr "etikett skjul felt om tomt"
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr ""
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr "etikett produkt på lager"
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr "etikett produkt antal grense"
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr "Kommentarer aktivert"
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr "Kommentar er påkrevd"
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 #, fuzzy
 msgid "label_item_display_gross"
 msgstr "Vis bruttopriser "
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr "etikett produkt vis lager"
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr ""
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr "Nettopris"
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 #, fuzzy
 msgid "label_item_notification_text"
 msgstr "etikett produktinformasjon"
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr "etikett produktnr."
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr "etikett produkt for mykje valgt"
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 #, fuzzy
 msgid "label_item_overbook_notification_text"
 msgstr "etikett produkt for mykje valgt produktinformasjon"
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr "Stykk"
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr "tal (som helttall)"
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr "etikett produkt fraktkostnader"
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr "moms (i prosent)"
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr "etikett etternamn"
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr "etikett maks produkt  antal"
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr "etikett betalingsmåte"
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr "etikett betaling tekst"
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 #, fuzzy
 msgid "label_phone"
 msgstr "etikett telefon"
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr "etikett antal produkter"
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr "etikett fraktalternativ produkter sendbar"
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr "etikett frakt produkt vekt"
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr "etikett frakt grense fra brutto"
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr "etikett fraktalternativ"
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr "etikett frakt mva"
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr "etikett vis avslutt"
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr "etikett vis valuta"
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr "etikett vis til felt"
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr ""
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr ""
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr ""
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr "etikett gateadresse"
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr "etikett totalt kun"
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr "etikett mva."
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr ""
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 msgid "label_zip"
 msgstr ""
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr "språk"
 
@@ -1156,13 +1169,8 @@ msgstr ""
 msgid "my_orders"
 msgstr "mine ordrer"
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr "Netto"
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr ""
 
@@ -1202,7 +1210,7 @@ msgid "not_available_yet_title"
 msgstr "ikkje på lager endå"
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr "bestelling tekst"
 
@@ -1247,17 +1255,17 @@ msgid "overbook_available_title"
 msgstr ""
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr "For mykje bestelt"
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr "betalng"
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr "betaling tekst"
 
@@ -1267,7 +1275,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr ""
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr "Pris"
 
@@ -1312,26 +1320,21 @@ msgid "shop_portlet"
 msgstr ""
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr "symbol"
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr "tekst"
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr "Oppdater handlekorga"
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr "mva"
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr "ja"
diff --git a/src/bda/plone/shop/locales/no/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/no/LC_MESSAGES/bda.plone.shop.po
index ac09e9f8..6faab556 100644
--- a/src/bda/plone/shop/locales/no/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/no/LC_MESSAGES/bda.plone.shop.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.5\n"
 
 #. Default: "Australian Dollar"
-#: ./vocabularies.py:102
+#: ./vocabularies.py:109
 msgid "AUD"
 msgstr ""
 
@@ -30,27 +30,27 @@ msgid "Activate vendor area on this context"
 msgstr ""
 
 #. Default: "Article"
-#: ./interfaces.py:174
+#: ./interfaces.py:175
 msgid "Article"
 msgstr ""
 
 #. Default: "Canadian Dollar"
-#: ./vocabularies.py:99
+#: ./vocabularies.py:106
 msgid "CAD"
 msgstr ""
 
 #. Default: "Swiss Franc"
-#: ./vocabularies.py:100
+#: ./vocabularies.py:107
 msgid "CHF"
 msgstr ""
 
 #. Default: "Cart"
-#: ./interfaces.py:108
+#: ./interfaces.py:109
 msgid "Cart"
 msgstr ""
 
 #. Default: "Danish Krone"
-#: ./vocabularies.py:105
+#: ./vocabularies.py:112
 msgid "DKK"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgid "Disables Buyable"
 msgstr "Deaktiver (handle) artikkel"
 
 #. Default: "Euro"
-#: ./vocabularies.py:96
+#: ./vocabularies.py:103
 msgid "EUR"
 msgstr ""
 
@@ -84,37 +84,37 @@ msgid "Enable Vendor Area"
 msgstr ""
 
 #. Default: "British Pound Sterling"
-#: ./vocabularies.py:101
+#: ./vocabularies.py:108
 msgid "GBP"
 msgstr ""
 
 #. Default: "Indian Rupee"
-#: ./vocabularies.py:98
+#: ./vocabularies.py:105
 msgid "INR"
 msgstr ""
 
 #. Default: "Invoice"
-#: ./interfaces.py:487
+#: ./interfaces.py:488
 msgid "Invoice"
 msgstr ""
 
 #. Default: "Norwegian Krone"
-#: ./vocabularies.py:103
+#: ./vocabularies.py:110
 msgid "NOK"
 msgstr ""
 
 #. Default: "New Zealand Dollar"
-#: ./vocabularies.py:107
+#: ./vocabularies.py:114
 msgid "NZD"
 msgstr ""
 
 #. Default: "Notifications"
-#: ./interfaces.py:417
+#: ./interfaces.py:418
 msgid "Notifications"
 msgstr ""
 
 #. Default: "Payment"
-#: ./interfaces.py:625
+#: ./interfaces.py:626
 msgid "Payment"
 msgstr ""
 
@@ -127,12 +127,12 @@ msgid "Personal Preferences"
 msgstr ""
 
 #. Default: "Swedish Krona"
-#: ./vocabularies.py:104
+#: ./vocabularies.py:111
 msgid "SEK"
 msgstr ""
 
 #. Default: "Shipping"
-#: ./interfaces.py:268
+#: ./interfaces.py:269
 msgid "Shipping"
 msgstr ""
 
@@ -141,15 +141,23 @@ msgstr ""
 msgid "Shop settings"
 msgstr ""
 
-#: ./interfaces.py:379
+#: ./interfaces.py:380
 msgid "Tax Settings"
 msgstr ""
 
 #. Default: "US Dollar"
-#: ./vocabularies.py:97
+#: ./vocabularies.py:104
 msgid "USD"
 msgstr ""
 
+#: ./upgrades/profiles.zcml:59
+msgid "Upgrade policy GS profile to 10"
+msgstr ""
+
+#: ./upgrades/profiles.zcml:67
+msgid "Upgrade policy GS profile to 11"
+msgstr ""
+
 #: ./upgrades/profiles.zcml:11
 msgid "Upgrade policy GS profile to 3"
 msgstr ""
@@ -175,12 +183,13 @@ msgid "Upgrade policy GS profile to 9"
 msgstr ""
 
 #. Default: "Japanese Yen"
-#: ./vocabularies.py:106
+#: ./vocabularies.py:113
 msgid "YEN"
 msgstr ""
 
 #. Default: "add to cart"
-#: ./browser/buyable.pt:108
+#: ./browser/buyable.pt:116
+#: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
 msgstr "Legg i handlekurv"
 
@@ -190,22 +199,22 @@ msgid "administration"
 msgstr ""
 
 #. Default: "No longer available, please remove from cart"
-#: ./cartdata.py:301
+#: ./cartdata.py:295
 msgid "alert_item_no_longer_available"
 msgstr ""
 
 #. Default: "Limit exceed by ${exceed} ${quantity_unit}"
-#: ./cartdata.py:313
+#: ./cartdata.py:307
 msgid "alert_item_number_exceed"
 msgstr ""
 
 #. Default: "${reserved} ${quantity_unit} reserved"
-#: ./cartdata.py:321
+#: ./cartdata.py:315
 msgid "alert_item_number_reserved"
 msgstr ""
 
 #. Default: "Partly reserved"
-#: ./cartdata.py:309
+#: ./cartdata.py:303
 msgid "alert_item_some_reserved"
 msgstr ""
 
@@ -274,7 +283,8 @@ msgid "centimeter"
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/buyable.pt:84
+#: ./browser/buyable.pt:95
+#: ./browser/buyable_mini.pt:68
 msgid "comment"
 msgstr "Kommentar"
 
@@ -333,6 +343,10 @@ msgstr "Lagt til produktbeskrivelse"
 msgid "enabled_vendor"
 msgstr ""
 
+#: ./browser/buyable.pt:68
+msgid "excl."
+msgstr ""
+
 #. Default: "Export"
 #: ./browser/navigation.py:479
 msgid "export"
@@ -408,23 +422,18 @@ msgstr ""
 msgid "gram"
 msgstr ""
 
-#. Default: "Gross"
-#: ./browser/buyable.pt:59
-msgid "gross"
-msgstr "Brutto"
-
 #. Default: "Tick this box to indicate that you have found, read and accepted the terms of use for this site."
 #: ./user/userdata.py:172
 msgid "help_accept"
 msgstr ""
 
 #. Default: "No typos please...."
-#: ./interfaces.py:58
+#: ./interfaces.py:59
 msgid "help_admin_email"
 msgstr ""
 
 #. Default: "Name used for Shop E-Mails."
-#: ./interfaces.py:66
+#: ./interfaces.py:67
 msgid "help_admin_name"
 msgstr ""
 
@@ -434,12 +443,12 @@ msgid "help_alternative_delivery"
 msgstr ""
 
 #. Default: "Available payment methods in checkout"
-#: ./interfaces.py:639
+#: ./interfaces.py:640
 msgid "help_available_payment_methods"
 msgstr ""
 
 #. Default: "Available shipping methods in checkout"
-#: ./interfaces.py:297
+#: ./interfaces.py:298
 msgid "help_available_shipping_methods"
 msgstr ""
 
@@ -456,32 +465,32 @@ msgid "help_country"
 msgstr ""
 
 #. Default: "Choose the default currency"
-#: ./interfaces.py:90
+#: ./interfaces.py:91
 msgid "help_currency"
 msgstr ""
 
 #. Default: "Shop administrator will be notified if stock is less than the specified threshold."
-#: ./interfaces.py:252
+#: ./interfaces.py:253
 msgid "help_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "default measurement"
-#: ./interfaces.py:207
+#: ./interfaces.py:208
 msgid "help_default_quantity_unit"
 msgstr ""
 
 #. Default: "Flag whether item is shippable by default, i.e. downloads are not"
-#: ./interfaces.py:286
+#: ./interfaces.py:287
 msgid "help_default_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Specify default vat name"
-#: ./interfaces.py:394
+#: ./interfaces.py:395
 msgid "help_default_vat"
 msgstr ""
 
 #. Default: "No total number of items in cart limit"
-#: ./interfaces.py:139
+#: ./interfaces.py:140
 msgid "help_disable_max_article"
 msgstr ""
 
@@ -491,12 +500,12 @@ msgid "help_firstname"
 msgstr ""
 
 #. Default: "Net flat shipping cost"
-#: ./interfaces.py:355
+#: ./interfaces.py:356
 msgid "help_flat_shipping_cost"
 msgstr ""
 
 #. Default: "Do not add shipping costs to orders with price bigger than limit. If limit applies to gross or net purchase price depends on 'Calculate shipping limit from gross' setting"
-#: ./interfaces.py:329
+#: ./interfaces.py:330
 msgid "help_free_shipping_limit"
 msgstr ""
 
@@ -505,92 +514,92 @@ msgid "help_gender"
 msgstr ""
 
 #. Default: "Global Trade Item Number"
-#: ./dx.py:502
+#: ./dx.py:510
 msgid "help_gtin"
 msgstr ""
 
 #. Default: "Hide cart if no items contained"
-#: ./interfaces.py:121
+#: ./interfaces.py:122
 msgid "help_hide_cart_if_empty"
 msgstr ""
 
 #. Default: "Invoice sender banking account BIC"
-#: ./interfaces.py:595
+#: ./interfaces.py:596
 msgid "help_invoice_bic"
 msgstr ""
 
 #. Default: "City of invoice sender"
-#: ./interfaces.py:550
+#: ./interfaces.py:551
 msgid "help_invoice_city"
 msgstr ""
 
 #. Default: "Company name of invoice sender."
-#: ./interfaces.py:507
+#: ./interfaces.py:508
 msgid "help_invoice_company"
 msgstr ""
 
 #. Default: "Optional additional line displayed under company name"
-#: ./interfaces.py:515
+#: ./interfaces.py:516
 msgid "help_invoice_companyadd"
 msgstr ""
 
 #. Default: "Country of invoice sender"
-#: ./interfaces.py:556
+#: ./interfaces.py:557
 msgid "help_invoice_country"
 msgstr ""
 
 #. Default: "Optional email address of invoice sender"
-#: ./interfaces.py:571
+#: ./interfaces.py:572
 msgid "help_invoice_email"
 msgstr ""
 
 #. Default: "Given name of invoice sender"
-#: ./interfaces.py:524
+#: ./interfaces.py:525
 msgid "help_invoice_firstname"
 msgstr ""
 
 #. Default: "Invoice sender banking account IBAN"
-#: ./interfaces.py:587
+#: ./interfaces.py:588
 msgid "help_invoice_iban"
 msgstr ""
 
 #. Default: "Last name of invoice sender"
-#: ./interfaces.py:532
+#: ./interfaces.py:533
 msgid "help_invoice_lastname"
 msgstr ""
 
 #. Default: "Optional phone number of invoice sender"
-#: ./interfaces.py:563
+#: ./interfaces.py:564
 msgid "help_invoice_phone"
 msgstr ""
 
 #. Default: "Street of invoice sender"
-#: ./interfaces.py:538
+#: ./interfaces.py:539
 msgid "help_invoice_street"
 msgstr ""
 
 #. Default: "Optional web address of invoice sender"
-#: ./interfaces.py:579
+#: ./interfaces.py:580
 msgid "help_invoice_web"
 msgstr ""
 
 #. Default: "Postal code of invoice sender"
-#: ./interfaces.py:544
+#: ./interfaces.py:545
 msgid "help_invoice_zip"
 msgstr ""
 
 #. Default: "Show price with taxes included"
-#: ./dx.py:111
+#: ./dx.py:119
 msgid "help_item_display_gross"
 msgstr ""
 
 #. Default: "Buyable Item number"
-#: ./dx.py:496
+#: ./dx.py:504
 msgid "help_item_number"
 msgstr ""
 
 #. Default: "Net shipping cost per item in cart. If flat shipping cost set and item shipping cost below flat shipping cost, flat shipping cost is used"
-#: ./interfaces.py:362
+#: ./interfaces.py:363
 msgid "help_item_shipping_cost"
 msgstr ""
 
@@ -600,12 +609,12 @@ msgid "help_lastname"
 msgstr ""
 
 #. Default: "Maximum number of articles in cart if disable max article flag set"
-#: ./interfaces.py:129
+#: ./interfaces.py:130
 msgid "help_max_artice_count"
 msgstr ""
 
 #. Default: "Default payment method in checkout"
-#: ./interfaces.py:653
+#: ./interfaces.py:654
 msgid "help_payment_method"
 msgstr ""
 
@@ -614,44 +623,44 @@ msgid "help_phone"
 msgstr ""
 
 #. Default: "Quantity units (what the buyable items are measured in)"
-#: ./interfaces.py:192
+#: ./interfaces.py:193
 msgid "help_quantity_units"
 msgstr ""
 
 #. Default: "Flag whether shipping of this item is free."
-#: ./dx.py:318
+#: ./dx.py:326
 msgid "help_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Flag whether item is shippable, i.e. downloads are not"
-#: ./dx.py:305
+#: ./dx.py:313
 msgid "help_shipping_item_shippable"
 msgstr ""
 
 #. Default: "If set to False, shipping limit gets calculated from net price instead of gross."
-#: ./interfaces.py:346
+#: ./interfaces.py:347
 msgid "help_shipping_limit_from_gross"
 msgstr ""
 
 #. Default: "Default shipping method in checkout"
-#: ./interfaces.py:311
+#: ./interfaces.py:312
 msgid "help_shipping_method"
 msgstr ""
 
 #. Default: "VAT used to calculate shipping costs"
-#: ./interfaces.py:319
+#: ./interfaces.py:320
 msgid "help_shipping_vat"
 msgstr ""
 
-#: ./interfaces.py:156
+#: ./interfaces.py:157
 msgid "help_show_checkout"
 msgstr ""
 
-#: ./interfaces.py:96
+#: ./interfaces.py:97
 msgid "help_show_currency"
 msgstr ""
 
-#: ./interfaces.py:162
+#: ./interfaces.py:163
 msgid "help_show_to_cart"
 msgstr ""
 
@@ -660,12 +669,12 @@ msgid "help_street"
 msgstr ""
 
 #. Default: "Show only total value in cart summary"
-#: ./interfaces.py:148
+#: ./interfaces.py:149
 msgid "help_summary_total_only"
 msgstr ""
 
 #. Default: "Specify all allowed vat settings"
-#: ./interfaces.py:384
+#: ./interfaces.py:385
 msgid "help_vat"
 msgstr ""
 
@@ -673,6 +682,10 @@ msgstr ""
 msgid "help_zip"
 msgstr ""
 
+#: ./browser/buyable.pt:66
+msgid "incl."
+msgstr ""
+
 #. Default: "Item Discount"
 #: ./browser/navigation.py:643
 msgid "item_discount"
@@ -704,17 +717,17 @@ msgid "label_accept"
 msgstr ""
 
 #. Default: "Add Customer role to new Users"
-#: ./interfaces.py:72
+#: ./interfaces.py:73
 msgid "label_add_customer_role_to_new_users"
 msgstr ""
 
 #. Default: "Shop Admin E-Mail"
-#: ./interfaces.py:57
+#: ./interfaces.py:58
 msgid "label_admin_email"
 msgstr ""
 
 #. Default: "Shop Admin Name"
-#: ./interfaces.py:65
+#: ./interfaces.py:66
 msgid "label_admin_name"
 msgstr ""
 
@@ -724,136 +737,136 @@ msgid "label_alternative_delivery"
 msgstr ""
 
 #. Default: "Available Payment Methods"
-#: ./interfaces.py:636
+#: ./interfaces.py:637
 msgid "label_available_payment_methods"
 msgstr ""
 
 #. Default: "Available Shipping Methods"
-#: ./interfaces.py:294
+#: ./interfaces.py:295
 msgid "label_available_shipping_methods"
 msgstr ""
 
 #. Default: "BIC"
-#: ./interfaces.py:594
+#: ./interfaces.py:595
 msgid "label_bic"
 msgstr ""
 
 #. Default: "Buyable effective date"
-#: ./dx.py:462
+#: ./dx.py:470
 msgid "label_buyable_effective_date"
 msgstr ""
 
 #. Default: "Buyable expiration date"
-#: ./dx.py:467
+#: ./dx.py:475
 msgid "label_buyable_expiration_date"
 msgstr ""
 
 #. Default: "Cash on delivery costs in gross"
-#: ./interfaces.py:678
+#: ./interfaces.py:679
 msgid "label_cash_on_delivery_costs"
 msgstr ""
 
 #. Default: "City"
-#: ./interfaces.py:549
+#: ./interfaces.py:550
 #: ./user/userdata.py:102
 msgid "label_city"
 msgstr ""
 
 #. Default: "Company"
-#: ./interfaces.py:506
+#: ./interfaces.py:507
 #: ./user/userdata.py:83
 msgid "label_company"
 msgstr ""
 
 #. Default: "Company additional"
-#: ./interfaces.py:514
+#: ./interfaces.py:515
 msgid "label_companyadd"
 msgstr ""
 
 #. Default: "Country"
-#: ./interfaces.py:555
+#: ./interfaces.py:556
 #: ./user/userdata.py:108
 msgid "label_country"
 msgstr ""
 
 #. Default: "Currency"
-#: ./interfaces.py:89
+#: ./interfaces.py:90
 msgid "label_currency"
 msgstr ""
 
 #. Default: "Quantity limit of an item in the cart."
-#: ./interfaces.py:240
+#: ./interfaces.py:241
 msgid "label_default_item_cart_count_limit"
 msgstr ""
 
 #. Default: "Comment enabled by default"
-#: ./interfaces.py:217
+#: ./interfaces.py:218
 msgid "label_default_item_comment_enabled"
 msgstr ""
 
 #. Default: "Comment required by default"
-#: ./interfaces.py:224
+#: ./interfaces.py:225
 msgid "label_default_item_comment_required"
 msgstr ""
 
 #. Default: "Display Gross by default"
-#: ./interfaces.py:82
+#: ./interfaces.py:83
 msgid "label_default_item_display_gross"
 msgstr ""
 
 #. Default: "Default Item net price"
-#: ./interfaces.py:212
+#: ./interfaces.py:213
 msgid "label_default_item_net"
 msgstr ""
 
 #. Default: "Quantity as float as default"
-#: ./interfaces.py:232
+#: ./interfaces.py:233
 msgid "label_default_item_quantity_unit_float"
 msgstr ""
 
 #. Default: "Item stock warning threshold."
-#: ./interfaces.py:248
+#: ./interfaces.py:249
 msgid "label_default_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Specify default quantity name."
-#: ./interfaces.py:204
+#: ./interfaces.py:205
 msgid "label_default_quantity_units"
 msgstr ""
 
 #. Default: "Item Shippable by default"
-#: ./interfaces.py:282
+#: ./interfaces.py:283
 msgid "label_default_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Default Value added tax name"
-#: ./interfaces.py:393
+#: ./interfaces.py:394
 msgid "label_default_vat"
 msgstr ""
 
 #. Default: "Disable max article"
-#: ./interfaces.py:138
+#: ./interfaces.py:139
 msgid "label_disable_max_article"
 msgstr ""
 
 #. Default: "Email address"
-#: ./interfaces.py:570
+#: ./interfaces.py:571
 msgid "label_email"
 msgstr ""
 
 #. Default: "First name"
-#: ./interfaces.py:523
+#: ./interfaces.py:524
 #: ./user/userdata.py:63
 msgid "label_firstname"
 msgstr ""
 
 #. Default: "Flat shipping cost"
-#: ./interfaces.py:354
+#: ./interfaces.py:355
 msgid "label_flat_shipping_cost"
 msgstr ""
 
 #. Default: "Free Shipping Limit"
-#: ./interfaces.py:328
+#: ./interfaces.py:329
 msgid "label_free_shipping_limit"
 msgstr ""
 
@@ -863,241 +876,241 @@ msgid "label_gender"
 msgstr ""
 
 #. Default: "GTIN"
-#: ./dx.py:501
+#: ./dx.py:509
 msgid "label_gtin"
 msgstr ""
 
 #. Default: "Hide Cart if empty"
-#: ./interfaces.py:120
+#: ./interfaces.py:121
 msgid "label_hide_cart_if_empty"
 msgstr ""
 
 #. Default: "IBAN"
-#: ./interfaces.py:586
+#: ./interfaces.py:587
 msgid "label_iban"
 msgstr ""
 
 #. Default: "Item stock available"
-#: ./dx.py:227
+#: ./dx.py:235
 msgid "label_item_available"
 msgstr ""
 
 #. Default: "Max count of this item in cart"
-#: ./dx.py:102
+#: ./dx.py:109
 msgid "label_item_cart_count_limit"
 msgstr ""
 
 #. Default: "Comment enabled"
-#: ./dx.py:119
+#: ./dx.py:127
 msgid "label_item_comment_enabled"
 msgstr "Kommentarer aktivert"
 
 #. Default: "Comment required"
-#: ./dx.py:125
+#: ./dx.py:133
 msgid "label_item_comment_required"
 msgstr "Kommentar er påkrevd"
 
 #. Default: "Display Gross Price"
-#: ./dx.py:110
+#: ./dx.py:118
 msgid "label_item_display_gross"
 msgstr "Vis bruttopriser"
 
 #. Default: "Display item stock"
-#: ./dx.py:221
+#: ./dx.py:229
 msgid "label_item_display_stock"
 msgstr ""
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item"
-#: ./dx.py:398
+#: ./dx.py:406
 msgid "label_item_global_notification_text"
 msgstr ""
 
 #. Default: "Additional overall notification text for the order confirmation mail of this item ordered if out of stock"
-#: ./dx.py:407
+#: ./dx.py:415
 msgid "label_item_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Item net price"
-#: ./dx.py:89
+#: ./dx.py:95
 msgid "label_item_net"
 msgstr "Nettopris"
 
 #. Default: "Notification text for this item in the order confirmation mail"
-#: ./dx.py:372
+#: ./dx.py:380
 msgid "label_item_notification_text"
 msgstr ""
 
 #. Default: "Item number"
-#: ./dx.py:495
+#: ./dx.py:503
 msgid "label_item_number"
 msgstr ""
 
 #. Default: "Item stock overbook"
-#: ./dx.py:232
+#: ./dx.py:240
 msgid "label_item_overbook"
 msgstr ""
 
 #. Default: "Notification text for this item in the order confirmation mail if item is out of stock"
-#: ./dx.py:381
+#: ./dx.py:389
 msgid "label_item_overbook_notification_text"
 msgstr ""
 
 #. Default: "Quantity unit"
-#: ./dx.py:137
+#: ./dx.py:145
 msgid "label_item_quantity_unit"
 msgstr "Stykk"
 
 #. Default: "Quantity as float"
-#: ./dx.py:131
+#: ./dx.py:139
 msgid "label_item_quantity_unit_float"
 msgstr "Antall (som helttall)"
 
 #. Default: "Item shipping cost"
-#: ./interfaces.py:361
+#: ./interfaces.py:362
 msgid "label_item_shipping_cost"
 msgstr ""
 
 #. Default: "Item stock warning threshold."
-#: ./dx.py:236
+#: ./dx.py:244
 msgid "label_item_stock_warning_threshold"
 msgstr ""
 
 #. Default: "Item VAT (in %)"
-#: ./dx.py:95
+#: ./dx.py:102
 msgid "label_item_vat"
 msgstr "moms (i prosent)"
 
 #. Default: "Last name"
-#: ./interfaces.py:531
+#: ./interfaces.py:532
 #: ./user/userdata.py:69
 msgid "label_lastname"
 msgstr ""
 
 #. Default: "Maximum number articles in cart"
-#: ./interfaces.py:128
+#: ./interfaces.py:129
 msgid "label_max_artice_count"
 msgstr ""
 
 #. Default: "Payment Method"
-#: ./interfaces.py:652
+#: ./interfaces.py:653
 msgid "label_payment_method"
 msgstr ""
 
 #. Default: "Payment Texts"
-#: ./interfaces.py:669
+#: ./interfaces.py:670
 msgid "label_payment_text"
 msgstr ""
 
 #. Default: "Phone"
-#: ./interfaces.py:562
+#: ./interfaces.py:563
 #: ./user/userdata.py:77
 msgid "label_phone"
 msgstr ""
 
 #. Default: "Specify quantity units allowed in shop."
-#: ./interfaces.py:189
+#: ./interfaces.py:190
 msgid "label_quantity_units"
 msgstr ""
 
 #. Default: "Free Shipping"
-#: ./dx.py:317
+#: ./dx.py:325
 msgid "label_shipping_item_free_shipping"
 msgstr ""
 
 #. Default: "Item Shippable"
-#: ./dx.py:304
+#: ./dx.py:312
 msgid "label_shipping_item_shippable"
 msgstr ""
 
 #. Default: "Item Weight"
-#: ./dx.py:313
+#: ./dx.py:321
 msgid "label_shipping_item_weight"
 msgstr ""
 
 #. Default: "Calculate shipping limit from gross"
-#: ./interfaces.py:342
+#: ./interfaces.py:343
 msgid "label_shipping_limit_from_gross"
 msgstr ""
 
 #. Default: "Shipping Method"
-#: ./interfaces.py:310
+#: ./interfaces.py:311
 msgid "label_shipping_method"
 msgstr ""
 
 #. Default: "Shipping VAT"
-#: ./interfaces.py:318
+#: ./interfaces.py:319
 msgid "label_shipping_vat"
 msgstr ""
 
 #. Default: "Show checkout link in portlet"
-#: ./interfaces.py:155
+#: ./interfaces.py:156
 msgid "label_show_checkout"
 msgstr ""
 
 #. Default: "Show the currency for items"
-#: ./interfaces.py:95
+#: ./interfaces.py:96
 msgid "label_show_currency"
 msgstr ""
 
 #. Default: "Show link to cart in portlet"
-#: ./interfaces.py:161
+#: ./interfaces.py:162
 msgid "label_show_to_cart"
 msgstr ""
 
 #. Default: "Overall notification text for order confirmation mail"
-#: ./interfaces.py:455
+#: ./interfaces.py:456
 msgid "label_site_global_notification_text"
 msgstr ""
 
 #. Default: "Overall notification text for order confirmation mail if order contains items out of stock"
-#: ./interfaces.py:467
+#: ./interfaces.py:468
 msgid "label_site_global_overbook_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail"
-#: ./interfaces.py:428
+#: ./interfaces.py:429
 msgid "label_site_item_notification_text"
 msgstr ""
 
 #. Default: "Default notification text for items in order confirmation mail if item out of stock."
-#: ./interfaces.py:441
+#: ./interfaces.py:442
 msgid "label_site_item_overbook_notification_text"
 msgstr ""
 
 #. Default: "Skip Payment if order contains reservations"
-#: ./interfaces.py:660
+#: ./interfaces.py:661
 msgid "label_skip_payment_if_order_contains_reservations"
 msgstr ""
 
 #. Default: "Street"
-#: ./interfaces.py:537
+#: ./interfaces.py:538
 #: ./user/userdata.py:90
 msgid "label_street"
 msgstr ""
 
 #. Default: "Cart Summary total only"
-#: ./interfaces.py:147
+#: ./interfaces.py:148
 msgid "label_summary_total_only"
 msgstr ""
 
 #. Default: "VAT in %"
-#: ./interfaces.py:383
+#: ./interfaces.py:384
 msgid "label_vat"
 msgstr ""
 
 #. Default: "Web address"
-#: ./interfaces.py:578
+#: ./interfaces.py:579
 msgid "label_web"
 msgstr ""
 
 #. Default: "Postal Code"
-#: ./interfaces.py:543
+#: ./interfaces.py:544
 #: ./user/userdata.py:96
 msgid "label_zip"
 msgstr ""
 
 #. Default: "Language"
-#: ./interfaces.py:402
+#: ./interfaces.py:403
 msgid "language"
 msgstr ""
 
@@ -1151,13 +1164,8 @@ msgstr ""
 msgid "my_orders"
 msgstr ""
 
-#. Default: "Net"
-#: ./browser/buyable.pt:43
-msgid "net"
-msgstr "Netto"
-
 #. Default: "No"
-#: ./vocabularies.py:121
+#: ./vocabularies.py:128
 msgid "no"
 msgstr ""
 
@@ -1197,7 +1205,7 @@ msgid "not_available_yet_title"
 msgstr ""
 
 #. Default: "Order Text"
-#: ./interfaces.py:434
+#: ./interfaces.py:435
 msgid "order_text"
 msgstr ""
 
@@ -1242,17 +1250,17 @@ msgid "overbook_available_title"
 msgstr ""
 
 #. Default: "Overbook Text"
-#: ./interfaces.py:447
+#: ./interfaces.py:448
 msgid "overbook_text"
 msgstr ""
 
 #. Default: "Payment"
-#: ./interfaces.py:605
+#: ./interfaces.py:606
 msgid "payment"
 msgstr ""
 
 #. Default: "Payment Text"
-#: ./interfaces.py:671
+#: ./interfaces.py:672
 msgid "payment_text"
 msgstr ""
 
@@ -1262,7 +1270,7 @@ msgid "permission_not_granted_to_buy_item"
 msgstr ""
 
 #. Default: "Price"
-#: ./browser/buyable.pt:34
+#: ./browser/buyable.pt:36
 msgid "price"
 msgstr "Pris"
 
@@ -1307,26 +1315,21 @@ msgid "shop_portlet"
 msgstr ""
 
 #. Default: "Symbol"
-#: ./vocabularies.py:122
+#: ./vocabularies.py:129
 msgid "symbol"
 msgstr ""
 
 #. Default: "Text"
-#: ./interfaces.py:407
+#: ./interfaces.py:408
 msgid "text"
 msgstr ""
 
-#. Default: "update cart"
-#: ./browser/buyable.pt:111
-msgid "update_cart"
-msgstr "Oppdater handlekurven"
-
 #. Default: "Vat"
-#: ./browser/buyable.pt:63
+#: ./browser/buyable.pt:70
 msgid "vat"
 msgstr "moms"
 
 #. Default: "Yes"
-#: ./vocabularies.py:120
+#: ./vocabularies.py:127
 msgid "yes"
 msgstr ""

From 4d82b7d423a11872106c1be0fc0a82ed38e3e8fc Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 29 May 2020 10:15:23 +0200
Subject: [PATCH 16/74] better line breaks

---
 src/bda/plone/shop/browser/buyable.pt | 117 +++++++++++++-------------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index 614d5370..5815573c 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -32,7 +32,7 @@
         <tal:net condition="not:view/display_gross"
                 define="price_original view/item_net_original;
                         price view/item_net">
-          <span class="price h4 mb-1">
+          <span class="price h4 mb-2 mr-2">
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
                 <span tal:replace="view/currency">EUR</span>
@@ -48,19 +48,19 @@
         <tal:gross condition="view/display_gross"
                 define="price_original view/item_gross_original;
                         price view/item_gross">
-          <span class="price h4 mb-1">
+          <span class="price h4 mb-2 mr-2">
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
               <span tal:replace="view/currency">EUR</span>
               <span tal:replace="python:'%0.2f' % price_original">1.0</span>
             </span>
-            <span class="discount">
+            <span class="value discount">
               <span tal:replace="view/currency">EUR</span>
               <span tal:replace="python:'%0.2f' % price">1.0</span>
             </span>
           </span>
         </tal:gross>
-        <label class="vat text-muted ml-2 mr-1">
+        <label class="vat text-muted mr-1 mb-2">
           <span tal:condition="view/display_gross"
                 class="mr-1" i18n:translate="incl.">incl.</span>
           <span tal:condition="not:view/display_gross"
@@ -70,67 +70,68 @@
         </label>
       </div>
     </tal:info>
-
-    <tal:buy condition="view/can_buy_items">
-      <div class="quantity-group input-group">
-        <label class="quantity mr-2" tal:content="view/quantity_unit">Quantity</label>
-        <div class="quantity mr-2">
-          <input type="number"
-                size="2"
-                value="1"
-                min="0"
-                class="form-control form-control-sm cart_item_count"
-                tal:define="css python: view.quantity_unit_float and \
-                                        'form-control form-control-sm cart_item_count quantity_unit_float' or
-                                        'form-control form-control-sm cart_item_count';"
-                tal:attributes="class css;
-                                disabled python: not addable and 'disabled' or None" />
+    <div class="input-group">
+      <tal:buy condition="view/can_buy_items">
+        <div class="quantity-group input-group mb-2">
+          <label class="quantity mr-2" tal:content="view/quantity_unit">Quantity</label>
+          <div class="quantity mr-2">
+            <input type="number"
+                  size="2"
+                  value="1"
+                  min="0"
+                  class="form-control form-control-sm cart_item_count"
+                  tal:define="css python: view.quantity_unit_float and \
+                                          'form-control form-control-sm cart_item_count quantity_unit_float' or
+                                          'form-control form-control-sm cart_item_count';"
+                  tal:attributes="class css;
+                                  disabled python: not addable and 'disabled' or None" />
+          </div>
         </div>
-      </div>
 
-      <tal:comment condition="view/comment_enabled">
-      <div class="comment-group input-group">
-        <label class="extra_comment mr-2" i18n:translate="comment">Comment</label>
-        <div class="extra_comment">
-          <input type="text"
-                 size="16"
-                 value=""
-                 class="form-control form-control-sm cart_item_comment"
-                 tal:define="css python: view.comment_required and \
-                                         'form-control form-control-sm cart_item_comment required' or
-                                         'form-control form-control-sm cart_item_comment';"
-                 tal:attributes="class css;
-                                 disabled python: not addable and 'disabled' or None" />
+        <tal:comment condition="view/comment_enabled">
+        <div class="comment-group input-group">
+          <label class="extra_comment mr-2" i18n:translate="comment">Comment</label>
+          <div class="extra_comment">
+            <input type="text"
+                  size="16"
+                  value=""
+                  class="form-control form-control-sm cart_item_comment"
+                  tal:define="css python: view.comment_required and \
+                                          'form-control form-control-sm cart_item_comment required' or
+                                          'form-control form-control-sm cart_item_comment';"
+                  tal:attributes="class css;
+                                  disabled python: not addable and 'disabled' or None" />
+          </div>
         </div>
-      </div>
-      </tal:comment>
-      <span tal:condition="view/can_buy_items"
-      class="cart_item_uid"
-      style="display: none;"
-      tal:content="view/item_uid">12345678</span>
+        </tal:comment>
+        <span tal:condition="view/can_buy_items"
+        class="cart_item_uid"
+        style="display: none;"
+        tal:content="view/item_uid">12345678</span>
 
-      <tal:addable condition="addable">
-      <div class="add-to-cart-group input-group">
-        <a href="" i18n:attributes="title add_to_cart"
-           class="btn btn-outline-primary btn-sm add_cart_item buyable_add_to_cart show_status_message">
-           <svg class="bi bi-bag" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path fill-rule="evenodd" d="M14 5H2v9a1 1 0 001 1h10a1 1 0 001-1V5zM1 4v10a2 2 0 002 2h10a2 2 0 002-2V4H1z" clip-rule="evenodd"/>
-            <path d="M8 1.5A2.5 2.5 0 005.5 4h-1a3.5 3.5 0 117 0h-1A2.5 2.5 0 008 1.5z"/>
-          </svg>
+        <tal:addable condition="addable">
+        <div class="add-to-cart-group input-group mb-2 mr-2">
+          <a href="" i18n:attributes="title add_to_cart"
+            class="btn btn-outline-primary btn-sm add_cart_item buyable_add_to_cart show_status_message">
+            <svg class="bi bi-bag" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M14 5H2v9a1 1 0 001 1h10a1 1 0 001-1V5zM1 4v10a2 2 0 002 2h10a2 2 0 002-2V4H1z" clip-rule="evenodd"/>
+              <path d="M8 1.5A2.5 2.5 0 005.5 4h-1a3.5 3.5 0 117 0h-1A2.5 2.5 0 008 1.5z"/>
+            </svg>
 
-           <span i18n:translate="add_to_cart">add to cart</span>
-        </a>
-      </div>
-      </tal:addable>
+            <span i18n:translate="add_to_cart">add to cart</span>
+          </a>
+        </div>
+        </tal:addable>
 
-      <tal:not_addable condition="not:addable">
-      <div class="add-to-cart-group input-group">
-        <span class="buyable_add_to_cart_disabled"
-              i18n:translate="add_to_cart">add to cart</span>
-      </div>
-      </tal:not_addable>
+        <tal:not_addable condition="not:addable">
+        <div class="add-to-cart-group input-group mb-2 mr-2">
+          <span class="buyable_add_to_cart_disabled"
+                i18n:translate="add_to_cart">add to cart</span>
+        </div>
+        </tal:not_addable>
 
-    </tal:buy>
+      </tal:buy>
+    </div>
   </div>
 
   </div>

From fd3f2f5388b6d6bdff3619fd15b7868c53cb6dd8 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Sat, 30 May 2020 12:38:01 +0200
Subject: [PATCH 17/74] update translation

---
 src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po b/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po
index 9c372b71..623c360b 100644
--- a/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po
+++ b/src/bda/plone/shop/locales/de/LC_MESSAGES/bda.plone.shop.po
@@ -190,7 +190,7 @@ msgstr "Japanischer Yen"
 #: ./browser/buyable.pt:116
 #: ./browser/buyable_mini.pt:89
 msgid "add_to_cart"
-msgstr "hinzufügen"
+msgstr "In den Warenkorb"
 
 #. Default: "Administration"
 #: ./browser/navigation.py:695

From 4e0ecd9112a47203250f042e77ed2e54edeb36fe Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Sat, 30 May 2020 12:38:25 +0200
Subject: [PATCH 18/74] % placement according to
 https://www.duden.de/rechtschreibung/Prozent

---
 src/bda/plone/shop/vocabularies.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/bda/plone/shop/vocabularies.py b/src/bda/plone/shop/vocabularies.py
index e2d0f135..eefaf63a 100644
--- a/src/bda/plone/shop/vocabularies.py
+++ b/src/bda/plone/shop/vocabularies.py
@@ -58,16 +58,16 @@ def QuantityUnitVocabulary(context):
 # control panel. If you need to provide more vat values add it here or
 # patch this vocab
 AVAILABLE_VAT_VALUES = {
-    "0": "0%",
-    "2.5": "2,5%",
-    "3.8": "3,8%",
-    "7.7": "7.7%",
-    "8": "8%",
-    "10": "10%",
-    "13": "13%",
-    "15": "15%",
-    "20": "20%",
-    "25": "25%",
+    "0": "0 %",
+    "2.5": "2,5 %",
+    "3.8": "3,8 %",
+    "7.7": "7.7 %",
+    "8": "8 %",
+    "10": "10 %",
+    "13": "13 %",
+    "15": "15 %",
+    "20": "20 %",
+    "25": "25 %",
 }
 
 

From 08e3e3dc63a7ffb1f843676e71b970459fa53873 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 1 Jun 2020 15:57:38 +0200
Subject: [PATCH 19/74] change scale

---
 src/bda/plone/shop/dx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/dx.py b/src/bda/plone/shop/dx.py
index c7cbdae5..d98cd546 100644
--- a/src/bda/plone/shop/dx.py
+++ b/src/bda/plone/shop/dx.py
@@ -357,7 +357,7 @@ class DXCartItemPreviewImage(CartItemPreviewAdapterBase):
     """Accessor Interface
     """
 
-    preview_scale = "tile"
+    preview_scale = "thumb"
 
     @property
     def url(self):

From 31eca33e37d73ffae402ba4edc4fbde4f7af53c8 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <office@squarewave.at>
Date: Wed, 16 Sep 2020 16:37:22 +0200
Subject: [PATCH 20/74] Remove Archetypes related documentation. Introduce
 ``bda.plone.shop.cartdata.CHECKOUT_INTERMEDIATE_VIEW``.

---
 CHANGES.rst                    |  6 +++
 README.rst                     | 86 +++++++---------------------------
 src/bda/plone/shop/cartdata.py | 11 ++++-
 3 files changed, 32 insertions(+), 71 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 64cb155e..f5c36056 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,12 @@ Changelog
 2.0.dev0 (unreleased)
 ---------------------
 
+- Introduce ``bda.plone.shop.cartdata.CHECKOUT_INTERMEDIATE_VIEW``.
+  [rnix]
+
+- Remove Archetypes related documentation.
+  [rnix]
+
 - Use BooleanIndex for item_buyable & add metadata.
   [agitator]
 
diff --git a/README.rst b/README.rst
index 63666d30..f600f61d 100644
--- a/README.rst
+++ b/README.rst
@@ -89,54 +89,10 @@ adapters implementing the following interfaces::
 - ``bda.plone.orders.interfaces.ITrading``
 - ``bda.plone.orders.interfaces.IBuyablePeriod``
 
-There exists Archetypes and Dexterity related implementations of these
-adapters among with related Schema Extenders respective Dexterity Behaviors.
+There exists implementations of these adapters among with related Dexterity Behaviors.
 
-For Plone 5 'Summary View' is overriden for folders and collections to show your buyables with controls to add them into the cart.
-
-
-Archetypes
-----------
-
-The Archetypes related implementation consists of Schema Extenders for each
-required interfaces which all are bound to ``IBuyable`` and the corresponding
-adapter implementations which are registered for
-``Products.Archetypes.BaseObject.BaseObject``.
-
-There exists a content action with which ``IBuyable`` interface can be set
-dynamically. To enable this Action content items must implement
-``bda.plone.shop.interfaces.IPotentiallyBuyable``.
-
-**Note** This action works for Archetypes based content only::
-
-    <class zcml:condition="installed Products.Archetypes"
-           class="Products.Archetypes.BaseObject.BaseObject">
-      <implements interface="bda.plone.shop.interfaces.IPotentiallyBuyable" />
-    </class>
-
-If Archetypes based content should be immediately buyable without explicit
-activation, set ``IBuyable`` interface directly on content class::
-
-    <class zcml:condition="installed Products.Archetypes"
-           class="Products.Archetypes.BaseObject.BaseObject">
-      <implements interface="bda.plone.orders.interfaces.IBuyable" />
-    </class>
-
-Notification related schema extenders can be applied to any Archetypes object
-including buyable items, notification text values are aquired until plone root
-is reached::
-
-    <adapter
-      name="bda.plone.shop.itemnotificationtext"
-      for="your.package.IContentInterface"
-      factory="bda.plone.shop.at.ItemNotificationTextExtender"
-      provides="archetypes.schemaextender.interfaces.IOrderableSchemaExtender" />
-
-    <adapter
-      name="bda.plone.shop.globalnotificationtext"
-      for="your.package.IContentInterface"
-      factory="bda.plone.shop.at.GlobalNotificationTextExtender"
-      provides="archetypes.schemaextender.interfaces.IOrderableSchemaExtender" />
+For Plone 5 'Summary View' is overriden for folders and collections to show your
+buyables with controls to add them into the cart.
 
 
 Dexterity
@@ -170,39 +126,27 @@ reached.
 Cart item preview images
 ========================
 
-The cart can render preview images for the cart items in case when
-
-1. the context has a field named ``image``
-2. ``collective.contentleadimage`` is installed (Archetypes only)
+The cart can render preview images for the cart items in case when the context
+has a field named ``image``
 
-You can easily change the preview image rendering by adapting your own cart
-items. If you want to change the scale of the image, inherit from the existing
-adapter class and change ``preview_scale`` property (example uses the
-Archetypes version)::
+You can change the preview image rendering by adapting your own cart items.
+If you want to change the scale of the image, inherit from the existing
+adapter class and change ``preview_scale`` property::
 
-    >>> from bda.plone.shop.at import ATCartItemPreviewImage
-    >>> class MyATCartItemPreviewImage(ATCartItemPreviewImage):
+    >>> from bda.plone.shop.dx import DXCartItemPreviewImage
+    >>> class MyDXCartItemPreviewImage(DXCartItemPreviewImage):
     ...     preview_scale = "my_scale"
 
 To do more complex preview image rendering you can override the ``url``
-property (example uses the Dexterity version)::
+property::
 
-    >>> from bda.plone.shop.dx import DXCartItemPreviewImage
     >>> class MyDXCartItemPreviewImage(DXCartItemPreviewImage):
     ...     @property
     ...     def url(self):
     ...         # do sophisticated stuff to get your preview image
     ...         return preview_url
 
-Register your adapter via ZCML.
-
-Archetypes::
-
-    <adapter
-      for="some.package.IMyATContent"
-      factory=".youradater.MyATCartItemPreviewImage" />
-
-Dexterity::
+Register your adapter via ZCML::
 
     <adapter
       for="some.package.IMyDXContent"
@@ -350,13 +294,15 @@ Backward incompatible changes
 Upgrade to Plone 5
 ==================
 
-If you upgrade to Plone 5, you have to run the upgrade step ``Remove old JS and CSS resources for Plone 5`` manually to remove the old registration of resources.
+If you upgrade to Plone 5, you have to run the upgrade step
+``Remove old JS and CSS resources for Plone 5`` manually to remove the old
+registration of resources.
 
 
 Contributors
 ============
 
-We'd be happy to see many forks and pull-requests to make this program even better.
+We'd be happy to see forks and pull-requests to improve this program.
 Professional support is offered by the maintainers and some of the authors.
 
 Maintainers
diff --git a/src/bda/plone/shop/cartdata.py b/src/bda/plone/shop/cartdata.py
index d378b7f3..91c90765 100644
--- a/src/bda/plone/shop/cartdata.py
+++ b/src/bda/plone/shop/cartdata.py
@@ -23,6 +23,10 @@
 import warnings
 
 
+# patch to define intermediate checkout view
+CHECKOUT_INTERMEDIATE_VIEW = None
+
+
 class CartItemCalculator(object):
     """Object for calculating cart item related data.
     """
@@ -170,7 +174,12 @@ def shipping_method(self):
 
     @property
     def checkout_url(self):
-        return "%s/@@checkout" % self.context.absolute_url()
+        view_name = '@@checkout'
+        # case anonymous user is permitted to perform checkout and intermediate
+        # view is defined. can be used to ask user to login before checkout
+        if api.user.is_anonymous() and CHECKOUT_INTERMEDIATE_VIEW:
+            view_name = CHECKOUT_INTERMEDIATE_VIEW
+        return "%s/%s" % (view_name, self.context.absolute_url())
 
     @property
     def cart_url(self):

From 173c6e636b07799b58214a9ff7a2388d6253d0b4 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 17 Sep 2020 09:08:53 +0200
Subject: [PATCH 21/74] fix CHECKOUT_INTERMEDIATE_VIEW url

---
 src/bda/plone/shop/cartdata.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/cartdata.py b/src/bda/plone/shop/cartdata.py
index 91c90765..234cc578 100644
--- a/src/bda/plone/shop/cartdata.py
+++ b/src/bda/plone/shop/cartdata.py
@@ -179,7 +179,10 @@ def checkout_url(self):
         # view is defined. can be used to ask user to login before checkout
         if api.user.is_anonymous() and CHECKOUT_INTERMEDIATE_VIEW:
             view_name = CHECKOUT_INTERMEDIATE_VIEW
-        return "%s/%s" % (view_name, self.context.absolute_url())
+        return "{0}{1}".format(
+            api.portal.get_navigation_root(self.context).absolute_url(),
+            view_name
+        )
 
     @property
     def cart_url(self):

From 7fea2381fb1b0f522d813bf49ec3209d3814e69e Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 17 Sep 2020 10:22:42 +0200
Subject: [PATCH 22/74] use context.absolute_url

---
 src/bda/plone/shop/cartdata.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bda/plone/shop/cartdata.py b/src/bda/plone/shop/cartdata.py
index 234cc578..36f370b9 100644
--- a/src/bda/plone/shop/cartdata.py
+++ b/src/bda/plone/shop/cartdata.py
@@ -179,8 +179,8 @@ def checkout_url(self):
         # view is defined. can be used to ask user to login before checkout
         if api.user.is_anonymous() and CHECKOUT_INTERMEDIATE_VIEW:
             view_name = CHECKOUT_INTERMEDIATE_VIEW
-        return "{0}{1}".format(
-            api.portal.get_navigation_root(self.context).absolute_url(),
+        return "{0}/{1}".format(
+            self.context.absolute_url(),
             view_name
         )
 

From 6032f81c7a1e550ea9b692b9d10b00e6f565d116 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 6 Nov 2020 10:41:44 +0100
Subject: [PATCH 23/74] update buildout for plone6 py3 only

---
 base.cfg           | 82 ++++++++++++++++++++++++++++++++++++++++++----
 bootstrap-5.1.x.sh |  7 ----
 bootstrap-5.2.x.sh |  7 ----
 bootstrap-6.x.sh   |  7 ++++
 plone-5.1.x.cfg    |  5 ---
 plone-5.2.x.cfg    |  5 ---
 plone-6.x.cfg      | 10 ++++++
 versions.cfg       | 11 ++++---
 8 files changed, 98 insertions(+), 36 deletions(-)
 delete mode 100755 bootstrap-5.1.x.sh
 delete mode 100755 bootstrap-5.2.x.sh
 create mode 100755 bootstrap-6.x.sh
 delete mode 100644 plone-5.1.x.cfg
 delete mode 100644 plone-5.2.x.cfg
 create mode 100644 plone-6.x.cfg

diff --git a/base.cfg b/base.cfg
index 68bd0de8..9ee7e9c3 100644
--- a/base.cfg
+++ b/base.cfg
@@ -19,13 +19,34 @@ package-min-coverage = 80
 
 [code-analysis]
 recipe = plone.recipe.codeanalysis
-directory = ${buildout:directory}/src
-flake8-ignore = C901,E241,F402,E501
-flake8-max-complexity = 20
-clean-lines = False
-imports = True
-debug-statements = True
-utf8-header = True
+multiprocessing = True
+directory = src
+pre-commit-hook = False
+jenkins = True
+check-manifest = True
+clean-lines = True
+# With line breaks and binary operators you will always hit one of these:
+# W503: Line break occurred before a binary operator
+# W504: Line break occurred after a binary operator
+# The pep8 guidelines were changed to recommend the line break before.
+# See https://lintlyci.github.io/Flake8Rules/rules/W503.html
+flake8-ignore = W503
+# keep this list in sync with what plone.recipe.codeanalysis defines
+# on its [recommended] extra, see:
+# https://github.com/plone/plone.recipe.codeanalysis/blob/master/setup.py
+flake8-extensions =
+    flake8-blind-except
+    flake8-coding
+    flake8-commas
+    flake8-debugger
+    flake8-deprecated
+    flake8-isort
+    flake8-pep3101
+    flake8-plone-hasattr
+    flake8-print
+    flake8-quotes
+    flake8-string-format
+    flake8-todo
 
 [instance]
 recipe = plone.recipe.zope2instance
@@ -92,3 +113,50 @@ ignore-develop = true
 unzip = true
 recipe = zc.recipe.egg
 eggs = i18ndude
+
+
+[versions]
+# from buildout.coredev qa.cfg 6.0
+flake8 = 3.3.0
+flake8-blind-except = 0.1.1
+flake8-coding = 1.3.0
+flake8-commas = 0.4.3
+flake8-debugger = 1.4.0
+flake8-deprecated = 1.2
+flake8-isort = 2.2.1
+flake8-pep3101 = 1.1
+flake8-plone-hasattr = 0.2.post0
+flake8-print = 2.0.2
+flake8-quotes = 0.11.0
+flake8-string-format = 0.2.3
+flake8-todo = 0.7
+mccabe = 0.6.1
+plone.recipe.codeanalysis = 2.2
+pycodestyle = 2.3.1
+pyflakes = 1.5.0
+zc.recipe.egg = 2.0.3
+
+# Required by:
+# plone.recipe.codeanalysis==2.2
+check-manifest = 0.34
+
+# Required by:
+# flake8==3.2.1
+configparser = 3.5.0
+
+# Required by:
+# flake8==3.2.1
+enum34 = 1.1.6
+
+# Required by:
+# flake8-isort==2.1.3
+flake8-polyfill = 1.0.1
+
+# Required by:
+# flake8-isort==2.1.3
+testfixtures = 4.13.1
+
+# Required by:
+# flake8-isort==2.2.1
+isort = 4.2.15
+
diff --git a/bootstrap-5.1.x.sh b/bootstrap-5.1.x.sh
deleted file mode 100755
index 4802ed64..00000000
--- a/bootstrap-5.1.x.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# see https://community.plone.org/t/not-using-bootstrap-py-as-default/620
-rm -r ./lib ./include ./local ./bin
-ln -fs plone-5.1.x.cfg buildout.cfg
-virtualenv --clear .
-./bin/pip install -r http://dist.plone.org/release/5.1-latest/requirements.txt
diff --git a/bootstrap-5.2.x.sh b/bootstrap-5.2.x.sh
deleted file mode 100755
index b9a6841b..00000000
--- a/bootstrap-5.2.x.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-rm -r ./lib ./include ./local ./bin
-ln -fs plone-5.2.x.cfg buildout.cfg
-pyenv virtualenv 3.8.1 bda.plone.shop
-pyenv local bda.plone.shop
-pip install -r http://dist.plone.org/release/5.2-latest/requirements.txt
-buildout
diff --git a/bootstrap-6.x.sh b/bootstrap-6.x.sh
new file mode 100755
index 00000000..c8028dc8
--- /dev/null
+++ b/bootstrap-6.x.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+rm -r ./lib ./include ./local ./bin
+ln -fs plone-6.x.cfg buildout.cfg
+pyenv virtualenv 3.8.6 bda.plone.shop
+pyenv local bda.plone.shop
+pip install -r https://raw.githubusercontent.com/plone/buildout.coredev/6.0/requirements.txt
+buildout
diff --git a/plone-5.1.x.cfg b/plone-5.1.x.cfg
deleted file mode 100644
index 27e167a7..00000000
--- a/plone-5.1.x.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[buildout]
-extends =
-    base.cfg
-    http://dist.plone.org/release/5.1-latest/versions.cfg
-    versions.cfg
diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg
deleted file mode 100644
index 8267c74d..00000000
--- a/plone-5.2.x.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[buildout]
-extends =
-    base.cfg
-    http://dist.plone.org/release/5.2-latest/versions.cfg
-    versions.cfg
diff --git a/plone-6.x.cfg b/plone-6.x.cfg
new file mode 100644
index 00000000..593203df
--- /dev/null
+++ b/plone-6.x.cfg
@@ -0,0 +1,10 @@
+[buildout]
+extends =
+    base.cfg
+# barceloneta plone 6
+    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/versions.cfg
+    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/sources.cfg
+    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/checkouts.cfg
+    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/plips/plip-2967-barceloneta-lts-source-checkouts.cfg
+
+    versions.cfg
diff --git a/versions.cfg b/versions.cfg
index 99bda7d2..04e322bb 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -28,9 +28,10 @@ github = git://github.com
 github_push = git@github.com
 
 [sources]
-bda.plone.discount          = git ${remotes:github}/bluedynamics/bda.plone.discount.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git
-bda.plone.checkout          = git ${remotes:github}/bluedynamics/bda.plone.checkout.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git
-bda.plone.cart              = git ${remotes:github}/bluedynamics/bda.plone.cart.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git
-bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payment.git           pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git
-bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git
+bda.plone.discount          = git ${remotes:github}/bluedynamics/bda.plone.discount.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git     branch=bootstrap-plone6
+bda.plone.checkout          = git ${remotes:github}/bluedynamics/bda.plone.checkout.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git     branch=bootstrap-plone6
+bda.plone.cart              = git ${remotes:github}/bluedynamics/bda.plone.cart.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git         branch=bootstrap-plone6
+bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payment.git           pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git      branch=bootstrap-plone6
+bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git       branch=bootstrap-plone6
 bda.plone.stripe            = git ${remotes:github}/bluedynamics/bda.plone.stripe.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
+

From bf21f19a7d299b4748d99a8a10818e53b9412f07 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Thu, 12 Nov 2020 11:35:41 +0100
Subject: [PATCH 24/74] add yafowil bootstrap checkouts

---
 versions.cfg | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/versions.cfg b/versions.cfg
index 04e322bb..5f57cab4 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -9,6 +9,11 @@ auto-checkout +=
     bda.plone.orders
     bda.plone.stripe
 
+    yafowil.plone
+    yafowil.bootstrap
+    yafowil.widget.datetime
+    yafowil
+
 [versions]
 yafowil = >=2.2b2
 yafowil.plone = >=4.0.0a3
@@ -28,10 +33,15 @@ github = git://github.com
 github_push = git@github.com
 
 [sources]
-bda.plone.discount          = git ${remotes:github}/bluedynamics/bda.plone.discount.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git     branch=bootstrap-plone6
-bda.plone.checkout          = git ${remotes:github}/bluedynamics/bda.plone.checkout.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git     branch=bootstrap-plone6
-bda.plone.cart              = git ${remotes:github}/bluedynamics/bda.plone.cart.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git         branch=bootstrap-plone6
-bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payment.git           pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git      branch=bootstrap-plone6
-bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git       branch=bootstrap-plone6
-bda.plone.stripe            = git ${remotes:github}/bluedynamics/bda.plone.stripe.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
+bda.plone.discount          = git ${remotes:github}/bluedynamics/bda.plone.discount.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git      branch=bootstrap-plone6
+bda.plone.checkout          = git ${remotes:github}/bluedynamics/bda.plone.checkout.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git      branch=bootstrap-plone6
+bda.plone.cart              = git ${remotes:github}/bluedynamics/bda.plone.cart.git                pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git          branch=bootstrap-plone6
+bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payment.git             pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git       branch=bootstrap-plone6
+bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git        branch=bootstrap-plone6
+bda.plone.stripe            = git ${remotes:github}/bluedynamics/bda.plone.stripe.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
+
+yafowil.plone               = git ${remotes:github}/bluedynamics/yafowil.plone.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git          branch=bootstrap-plone6
+yafowil.bootstrap           = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git             pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap          branch=bootstrap4
+yafowil.widget.datetime     = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime    branch=bootstrap4
+yafowil                     = git ${remotes:github}/bluedynamics/yafowil.git                       pushurl=${remotes:github_push}:bluedynamics/yafowil.git                branch=bootstrap-plone6
 

From 3c48f3cb42620f4b4c66bf7b8f0609ec6a63fd9a Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 13 Nov 2020 14:17:34 +0100
Subject: [PATCH 25/74] add yafowil bootstrap5

---
 versions.cfg | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/versions.cfg b/versions.cfg
index 5f57cab4..94a24a39 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -33,15 +33,15 @@ github = git://github.com
 github_push = git@github.com
 
 [sources]
-bda.plone.discount          = git ${remotes:github}/bluedynamics/bda.plone.discount.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git      branch=bootstrap-plone6
-bda.plone.checkout          = git ${remotes:github}/bluedynamics/bda.plone.checkout.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git      branch=bootstrap-plone6
-bda.plone.cart              = git ${remotes:github}/bluedynamics/bda.plone.cart.git                pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git          branch=bootstrap-plone6
-bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payment.git             pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git       branch=bootstrap-plone6
-bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git        branch=bootstrap-plone6
+bda.plone.discount          = git ${remotes:github}/bluedynamics/bda.plone.discount.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git        branch=bootstrap-plone6
+bda.plone.checkout          = git ${remotes:github}/bluedynamics/bda.plone.checkout.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git        branch=bootstrap-plone6
+bda.plone.cart              = git ${remotes:github}/bluedynamics/bda.plone.cart.git                pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git            branch=bootstrap-plone6
+bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payment.git             pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git         branch=bootstrap-plone6
+bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git          branch=bootstrap-plone6
 bda.plone.stripe            = git ${remotes:github}/bluedynamics/bda.plone.stripe.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
 
-yafowil.plone               = git ${remotes:github}/bluedynamics/yafowil.plone.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git          branch=bootstrap-plone6
-yafowil.bootstrap           = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git             pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap          branch=bootstrap4
-yafowil.widget.datetime     = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime    branch=bootstrap4
-yafowil                     = git ${remotes:github}/bluedynamics/yafowil.git                       pushurl=${remotes:github_push}:bluedynamics/yafowil.git                branch=bootstrap-plone6
+yafowil.plone               = git ${remotes:github}/bluedynamics/yafowil.plone.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git             branch=switch-to-bootstrap-5
+yafowil.bootstrap           = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git             pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git         branch=bootstrap5
+yafowil.widget.datetime     = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime.git   branch=bootstrap4
+yafowil                     = git ${remotes:github}/bluedynamics/yafowil.git                       pushurl=${remotes:github_push}:bluedynamics/yafowil.git                   branch=bootstrap-plone6
 

From 04ab9e8f352737c5a653d09b2d5802b80573df75 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Fri, 13 Nov 2020 14:18:41 +0100
Subject: [PATCH 26/74] bs5 markup

---
 src/bda/plone/shop/browser/buyable.pt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index 5815573c..1d64c5c0 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -11,7 +11,7 @@
 
   <tal:info condition="view/can_view_buyable_info">
     <div class="availabilityWrapper form-row">
-      <div class="availability form-group form-inline" tal:condition="view/show_available">
+      <div class="availability mb-3 form-inline" tal:condition="view/show_available">
         <strong class="mr-2" i18n:translate="availability">Availability</strong>
         <div class="signal green"
              tal:attributes="class string:signal ${view/availability_signal}">
@@ -26,7 +26,7 @@
   </tal:info>
 
   <div class="form-row details ${python:'with-comment' if view.comment_enabled else 'without-comment'}">
-    <div class="form-group form-inline col-md">
+    <div class="mb-3 form-inline col-md">
     <tal:info condition="view/can_view_buyable_info">
       <div class="price-group input-group mr-2">
         <tal:net condition="not:view/display_gross"

From 8d7da178c78ef501723a48691ef380f7aaeda230 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Wed, 16 Dec 2020 11:59:46 +0100
Subject: [PATCH 27/74] bootstrap b1 changes

---
 src/bda/plone/shop/browser/buyable.pt | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bda/plone/shop/browser/buyable.pt b/src/bda/plone/shop/browser/buyable.pt
index 1d64c5c0..d27d634f 100644
--- a/src/bda/plone/shop/browser/buyable.pt
+++ b/src/bda/plone/shop/browser/buyable.pt
@@ -12,7 +12,7 @@
   <tal:info condition="view/can_view_buyable_info">
     <div class="availabilityWrapper form-row">
       <div class="availability mb-3 form-inline" tal:condition="view/show_available">
-        <strong class="mr-2" i18n:translate="availability">Availability</strong>
+        <strong class="me-2" i18n:translate="availability">Availability</strong>
         <div class="signal green"
              tal:attributes="class string:signal ${view/availability_signal}">
           &nbsp;
@@ -28,11 +28,11 @@
   <div class="form-row details ${python:'with-comment' if view.comment_enabled else 'without-comment'}">
     <div class="mb-3 form-inline col-md">
     <tal:info condition="view/can_view_buyable_info">
-      <div class="price-group input-group mr-2">
+      <div class="price-group input-group me-2">
         <tal:net condition="not:view/display_gross"
                 define="price_original view/item_net_original;
                         price view/item_net">
-          <span class="price h4 mb-2 mr-2">
+          <span class="price h4 mb-2 me-2">
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
                 <span tal:replace="view/currency">EUR</span>
@@ -48,7 +48,7 @@
         <tal:gross condition="view/display_gross"
                 define="price_original view/item_gross_original;
                         price view/item_gross">
-          <span class="price h4 mb-2 mr-2">
+          <span class="price h4 mb-2 me-2">
             <span class="value original"
                 tal:condition="python:view.not_eq(price_original, price)">
               <span tal:replace="view/currency">EUR</span>
@@ -60,12 +60,12 @@
             </span>
           </span>
         </tal:gross>
-        <label class="vat text-muted mr-1 mb-2">
+        <label class="vat text-muted me-1 mb-2">
           <span tal:condition="view/display_gross"
-                class="mr-1" i18n:translate="incl.">incl.</span>
+                class="me-1" i18n:translate="incl.">incl.</span>
           <span tal:condition="not:view/display_gross"
-                class="mr-1" i18n:translate="excl.">excl.</span>
-                <span class="mr-1" i18n:translate="vat">Vat</span>
+                class="me-1" i18n:translate="excl.">excl.</span>
+                <span class="me-1" i18n:translate="vat">Vat</span>
           <span class="" tal:content="string:${view/item_vat}%">20 %</span>
         </label>
       </div>
@@ -73,8 +73,8 @@
     <div class="input-group">
       <tal:buy condition="view/can_buy_items">
         <div class="quantity-group input-group mb-2">
-          <label class="quantity mr-2" tal:content="view/quantity_unit">Quantity</label>
-          <div class="quantity mr-2">
+          <label class="quantity me-2" tal:content="view/quantity_unit">Quantity</label>
+          <div class="quantity me-2">
             <input type="number"
                   size="2"
                   value="1"
@@ -90,7 +90,7 @@
 
         <tal:comment condition="view/comment_enabled">
         <div class="comment-group input-group">
-          <label class="extra_comment mr-2" i18n:translate="comment">Comment</label>
+          <label class="extra_comment me-2" i18n:translate="comment">Comment</label>
           <div class="extra_comment">
             <input type="text"
                   size="16"
@@ -110,7 +110,7 @@
         tal:content="view/item_uid">12345678</span>
 
         <tal:addable condition="addable">
-        <div class="add-to-cart-group input-group mb-2 mr-2">
+        <div class="add-to-cart-group input-group mb-2 me-2">
           <a href="" i18n:attributes="title add_to_cart"
             class="btn btn-outline-primary btn-sm add_cart_item buyable_add_to_cart show_status_message">
             <svg class="bi bi-bag" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -124,7 +124,7 @@
         </tal:addable>
 
         <tal:not_addable condition="not:addable">
-        <div class="add-to-cart-group input-group mb-2 mr-2">
+        <div class="add-to-cart-group input-group mb-2 me-2">
           <span class="buyable_add_to_cart_disabled"
                 i18n:translate="add_to_cart">add to cart</span>
         </div>

From 25a99f577d18c9716d5dd4cfcb47ef8dbab341c4 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Sun, 27 Dec 2020 15:19:05 +0100
Subject: [PATCH 28/74] mark as not required

---
 src/bda/plone/shop/interfaces.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 1cde8b1e..7eee1ab5 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -123,6 +123,7 @@ class IShopCartSettings(model.Schema):
             u"help_hide_cart_if_empty", default=u"Hide cart if no items contained"
         ),
         default=False,
+        required=False,
     )
 
     max_artice_count = schema.Int(
@@ -142,6 +143,7 @@ class IShopCartSettings(model.Schema):
             default=u"No total number of items in cart limit",
         ),
         default=True,
+        required=False,
     )
 
     summary_total_only = schema.Bool(
@@ -150,18 +152,21 @@ class IShopCartSettings(model.Schema):
             u"help_summary_total_only", default=u"Show only total value in cart summary"
         ),
         default=False,
+        required=False,
     )
 
     show_checkout = schema.Bool(
         title=_(u"label_show_checkout", default=u"Show checkout link in portlet"),
         description=_(u"help_show_checkout", default=""),
         default=False,
+        required=False,
     )
 
     show_to_cart = schema.Bool(
         title=_(u"label_show_to_cart", default=u"Show link to cart in portlet"),
         description=_(u"help_show_to_cart", default=u""),
         default=True,
+        required=False,
     )
 
 
@@ -194,8 +199,8 @@ class IShopArticleSettings(model.Schema):
             u"help_quantity_units",
             default=u"Quantity units (what the buyable items are measured in)",
         ),
-        required=True,
-        missing_value=set(),
+        required=False,
+        missing_value=set(['quantity']),
         value_type=schema.Choice(
             vocabulary="bda.plone.shop.vocabularies." "AvailableQuantityUnitVocabulary"
         ),
@@ -289,6 +294,7 @@ class IShopShippingSettings(model.Schema):
             default=u"Flag whether item is shippable by default, "
             u"i.e. downloads are not",
         ),
+        required=False,
     )
 
     available_shipping_methods = schema.List(
@@ -349,6 +355,7 @@ class IShopShippingSettings(model.Schema):
             default=u"If set to False, shipping limit gets "
             u"calculated from net price instead of gross.",
         ),
+        required=False,
     )
 
     flat_shipping_cost = schema.Decimal(
@@ -383,8 +390,8 @@ class IShopTaxSettings(model.Schema):
     vat = schema.List(
         title=_(u"label_vat", default=u"VAT in %"),
         description=_(u"help_vat", default=u"Specify all allowed vat settings"),
-        required=True,
-        missing_value=set(),
+        required=False,
+        missing_value=set([0]),
         value_type=schema.Choice(
             vocabulary="bda.plone.shop.vocabularies.AvailableVatVocabulary"
         ),

From 175e3d2ccb01abba06688699a7c19427fd563bc9 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 28 Dec 2020 14:38:46 +0100
Subject: [PATCH 29/74] mark as not required

---
 src/bda/plone/shop/dx.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/bda/plone/shop/dx.py b/src/bda/plone/shop/dx.py
index d98cd546..d67ce15a 100644
--- a/src/bda/plone/shop/dx.py
+++ b/src/bda/plone/shop/dx.py
@@ -237,7 +237,8 @@ class IStockBehavior(model.Schema):
     )
 
     item_overbook = schema.Float(
-        title=_(u"label_item_overbook", default=u"Item stock overbook"), required=False
+        title=_(u"label_item_overbook", default=u"Item stock overbook"), 
+        required=False
     )
 
     item_stock_warning_threshold = schema.Float(
@@ -315,10 +316,12 @@ class IShippingBehavior(model.Schema):
             default=u"Flag whether item is shippable, i.e. " u"downloads are not",
         ),
         defaultFactory=default_shipping_item_shippable,
+        required=False
     )
 
     shipping_item_weight = schema.Float(
-        title=_(u"label_shipping_item_weight", default=u"Item Weight"), required=False
+        title=_(u"label_shipping_item_weight", default=u"Item Weight"), 
+        required=False
     )
 
     shipping_item_free_shipping = schema.Bool(
@@ -327,6 +330,7 @@ class IShippingBehavior(model.Schema):
             "help_shipping_item_free_shipping",
             default=u"Flag whether shipping of this item is free.",
         ),
+        required=False
     )
 
 

From 373481febbfee4b23e85720655ac9a8bcc401e90 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <office@squarewave.at>
Date: Fri, 19 Feb 2021 07:49:13 +0100
Subject: [PATCH 30/74] Restore venv support, fix versions

---
 .gitignore       |  1 +
 bootstrap-6.x.sh | 31 ++++++++++++++++++++++++-------
 versions.cfg     |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 524b7de0..02d814d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /.installed.cfg
 /.settings/
 /.vscode/
+/pyvenv.cfg
 /buildout.cfg
 /bin/
 /develop-eggs/
diff --git a/bootstrap-6.x.sh b/bootstrap-6.x.sh
index c8028dc8..d8684602 100755
--- a/bootstrap-6.x.sh
+++ b/bootstrap-6.x.sh
@@ -1,7 +1,24 @@
-#!/bin/sh
-rm -r ./lib ./include ./local ./bin
-ln -fs plone-6.x.cfg buildout.cfg
-pyenv virtualenv 3.8.6 bda.plone.shop
-pyenv local bda.plone.shop
-pip install -r https://raw.githubusercontent.com/plone/buildout.coredev/6.0/requirements.txt
-buildout
+#!/bin/bash
+set -e
+
+REQUIREMENTS="https://raw.githubusercontent.com/plone/buildout.coredev/6.0/requirements.txt"
+
+for dir in lib include local bin share pyvenv.cfg lib64; do
+    if [ -d "$dir" ]; then
+        echo "Removing $dir..."
+        rm -r "$dir"
+    fi
+done
+
+if [ "$1" == "venv" ]; then
+    ln -fs plone-6.x.cfg buildout.cfg
+    python3 -m venv .
+    ./bin/pip install -r $REQUIREMENTS
+    ./bin/buildout
+else
+
+    pyenv virtualenv 3.8.6 bda.plone.shop
+    pyenv local bda.plone.shop
+    pip install -r $REQUIREMENTS
+    buildout
+fi
diff --git a/versions.cfg b/versions.cfg
index 94a24a39..2b6ddbe9 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -40,7 +40,7 @@ bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payme
 bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git          branch=bootstrap-plone6
 bda.plone.stripe            = git ${remotes:github}/bluedynamics/bda.plone.stripe.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
 
-yafowil.plone               = git ${remotes:github}/bluedynamics/yafowil.plone.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git             branch=switch-to-bootstrap-5
+yafowil.plone               = git ${remotes:github}/bluedynamics/yafowil.plone.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git             branch=bootstrap-plone6
 yafowil.bootstrap           = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git             pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git         branch=bootstrap5
 yafowil.widget.datetime     = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime.git   branch=bootstrap4
 yafowil                     = git ${remotes:github}/bluedynamics/yafowil.git                       pushurl=${remotes:github_push}:bluedynamics/yafowil.git                   branch=bootstrap-plone6

From e30279fc1d7ab7790369106d2fd2dd7970dd6df2 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <office@squarewave.at>
Date: Fri, 19 Feb 2021 08:17:52 +0100
Subject: [PATCH 31/74] pin pygments version

---
 bootstrap-6.x.sh |  1 -
 versions.cfg     | 25 +++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bootstrap-6.x.sh b/bootstrap-6.x.sh
index d8684602..e949196e 100755
--- a/bootstrap-6.x.sh
+++ b/bootstrap-6.x.sh
@@ -16,7 +16,6 @@ if [ "$1" == "venv" ]; then
     ./bin/pip install -r $REQUIREMENTS
     ./bin/buildout
 else
-
     pyenv virtualenv 3.8.6 bda.plone.shop
     pyenv local bda.plone.shop
     pip install -r $REQUIREMENTS
diff --git a/versions.cfg b/versions.cfg
index 2b6ddbe9..38b2858d 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -28,20 +28,21 @@ plumber = >=1.5
 docutils = >=0.13.1
 plone.app.robotframework = >=1.2.0
 
+pygments = 2.5.2
+
 [remotes]
 github = git://github.com
 github_push = git@github.com
 
 [sources]
-bda.plone.discount          = git ${remotes:github}/bluedynamics/bda.plone.discount.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git        branch=bootstrap-plone6
-bda.plone.checkout          = git ${remotes:github}/bluedynamics/bda.plone.checkout.git            pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git        branch=bootstrap-plone6
-bda.plone.cart              = git ${remotes:github}/bluedynamics/bda.plone.cart.git                pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git            branch=bootstrap-plone6
-bda.plone.payment           = git ${remotes:github}/bluedynamics/bda.plone.payment.git             pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git         branch=bootstrap-plone6
-bda.plone.orders            = git ${remotes:github}/bluedynamics/bda.plone.orders.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git          branch=bootstrap-plone6
-bda.plone.stripe            = git ${remotes:github}/bluedynamics/bda.plone.stripe.git              pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
-
-yafowil.plone               = git ${remotes:github}/bluedynamics/yafowil.plone.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git             branch=bootstrap-plone6
-yafowil.bootstrap           = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git             pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git         branch=bootstrap5
-yafowil.widget.datetime     = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime.git   branch=bootstrap4
-yafowil                     = git ${remotes:github}/bluedynamics/yafowil.git                       pushurl=${remotes:github_push}:bluedynamics/yafowil.git                   branch=bootstrap-plone6
-
+bda.plone.discount      = git ${remotes:github}/bluedynamics/bda.plone.discount.git      pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git      branch=bootstrap-plone6
+bda.plone.checkout      = git ${remotes:github}/bluedynamics/bda.plone.checkout.git      pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git      branch=bootstrap-plone6
+bda.plone.cart          = git ${remotes:github}/bluedynamics/bda.plone.cart.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git          branch=bootstrap-plone6
+bda.plone.payment       = git ${remotes:github}/bluedynamics/bda.plone.payment.git       pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git       branch=bootstrap-plone6
+bda.plone.orders        = git ${remotes:github}/bluedynamics/bda.plone.orders.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git        branch=bootstrap-plone6
+bda.plone.stripe        = git ${remotes:github}/bluedynamics/bda.plone.stripe.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
+
+yafowil.plone           = git ${remotes:github}/bluedynamics/yafowil.plone.git           pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git           branch=bootstrap-plone6
+yafowil.bootstrap       = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git       branch=bootstrap5
+yafowil.widget.datetime = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime.git branch=bootstrap4
+yafowil                 = git ${remotes:github}/bluedynamics/yafowil.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.git                 branch=bootstrap-plone6

From 02ae8b1e524a9071eb19507903087ab39781d365 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Tue, 11 May 2021 17:28:12 +0200
Subject: [PATCH 32/74] fix datagridfield imports

---
 src/bda/plone/shop/interfaces.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 7eee1ab5..2bd07d87 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -3,8 +3,8 @@
 from bda.plone.orders.interfaces import IItemNotificationText
 from bda.plone.orders.interfaces import IOrdersExtensionLayer
 from bda.plone.shop import message_factory as _
-from collective.z3cform.datagridfield import DataGridFieldFactory
-from collective.z3cform.datagridfield.registry import DictRow
+from collective.z3cform.datagridfield.datagridfield import DataGridFieldFactory
+from collective.z3cform.datagridfield.row import DictRow
 from decimal import Decimal
 from plone.autoform.directives import widget
 from plone.supermodel import model

From d3a0a014f8b4254aec7052346936e511e5d3644a Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 16 Aug 2021 15:16:36 +0200
Subject: [PATCH 33/74] update buildout

---
 base.cfg         | 1 +
 bootstrap-6.x.sh | 2 +-
 plone-6.x.cfg    | 1 -
 versions.cfg     | 5 +++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/base.cfg b/base.cfg
index 9ee7e9c3..a6a0215b 100644
--- a/base.cfg
+++ b/base.cfg
@@ -56,6 +56,7 @@ debug-mode = on
 verbose-security = off
 deprecation-warnings = on
 blob-storage = var/blobstorage
+zodb-temporary-storage = off
 environment-vars =
     zope_i18n_compile_mo_files true
 
diff --git a/bootstrap-6.x.sh b/bootstrap-6.x.sh
index e949196e..be1213ef 100755
--- a/bootstrap-6.x.sh
+++ b/bootstrap-6.x.sh
@@ -16,7 +16,7 @@ if [ "$1" == "venv" ]; then
     ./bin/pip install -r $REQUIREMENTS
     ./bin/buildout
 else
-    pyenv virtualenv 3.8.6 bda.plone.shop
+    pyenv virtualenv 3.8.6 bda.plone6.shop
     pyenv local bda.plone.shop
     pip install -r $REQUIREMENTS
     buildout
diff --git a/plone-6.x.cfg b/plone-6.x.cfg
index 593203df..9c2bc55a 100644
--- a/plone-6.x.cfg
+++ b/plone-6.x.cfg
@@ -5,6 +5,5 @@ extends =
     https://raw.githubusercontent.com/plone/buildout.coredev/6.0/versions.cfg
     https://raw.githubusercontent.com/plone/buildout.coredev/6.0/sources.cfg
     https://raw.githubusercontent.com/plone/buildout.coredev/6.0/checkouts.cfg
-    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/plips/plip-2967-barceloneta-lts-source-checkouts.cfg
 
     versions.cfg
diff --git a/versions.cfg b/versions.cfg
index 38b2858d..2f9b15fd 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -19,6 +19,7 @@ yafowil = >=2.2b2
 yafowil.plone = >=4.0.0a3
 collective.js.datatables = >=4.1.2
 
+
 # stripe wants newer request
 requests = >=2.20
 
@@ -43,6 +44,6 @@ bda.plone.orders        = git ${remotes:github}/bluedynamics/bda.plone.orders.gi
 bda.plone.stripe        = git ${remotes:github}/bluedynamics/bda.plone.stripe.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
 
 yafowil.plone           = git ${remotes:github}/bluedynamics/yafowil.plone.git           pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git           branch=bootstrap-plone6
-yafowil.bootstrap       = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git       branch=bootstrap5
+yafowil.bootstrap       = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git       branch=2.0
 yafowil.widget.datetime = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime.git branch=bootstrap4
-yafowil                 = git ${remotes:github}/bluedynamics/yafowil.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.git                 branch=bootstrap-plone6
+yafowil                 = git ${remotes:github}/bluedynamics/yafowil.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.git                 branch=3.0

From 2c78046436ddf368f12c679d8eda0f6ed45d03e6 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 16 Aug 2021 16:44:04 +0200
Subject: [PATCH 34/74] py 3.9.x

---
 bootstrap-6.x.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-6.x.sh b/bootstrap-6.x.sh
index be1213ef..4401c137 100755
--- a/bootstrap-6.x.sh
+++ b/bootstrap-6.x.sh
@@ -16,8 +16,8 @@ if [ "$1" == "venv" ]; then
     ./bin/pip install -r $REQUIREMENTS
     ./bin/buildout
 else
-    pyenv virtualenv 3.8.6 bda.plone6.shop
-    pyenv local bda.plone.shop
+    pyenv virtualenv 3.9.6 bda.plone6.shop
+    pyenv local bda.plone6.shop
     pip install -r $REQUIREMENTS
     buildout
 fi

From 6ee3d875b5551bed87b5cee612bc0dac085a4af9 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 16 Aug 2021 18:10:18 +0200
Subject: [PATCH 35/74] fix DictRow import

---
 src/bda/plone/shop/interfaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 2bd07d87..41054c49 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -4,7 +4,7 @@
 from bda.plone.orders.interfaces import IOrdersExtensionLayer
 from bda.plone.shop import message_factory as _
 from collective.z3cform.datagridfield.datagridfield import DataGridFieldFactory
-from collective.z3cform.datagridfield.row import DictRow
+from collective.z3cform.datagridfield.registry import DictRow
 from decimal import Decimal
 from plone.autoform.directives import widget
 from plone.supermodel import model

From c66a01c8167ce7bfe01fb40678e2d1aeb7ee21f2 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 20 Sep 2021 21:52:25 +0200
Subject: [PATCH 36/74] add bda.plone.wallee & vscode

---
 base.cfg | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/base.cfg b/base.cfg
index a6a0215b..97684189 100644
--- a/base.cfg
+++ b/base.cfg
@@ -9,6 +9,8 @@ parts =
     releaser
     code-analysis
     i18ndude
+    vscode
+
 
 git-clone-depth = 50
 
@@ -63,6 +65,7 @@ environment-vars =
 eggs =
     bda.plone.shop
     bda.plone.stripe
+    bda.plone.wallee
 
 
 [releaser]
@@ -116,7 +119,17 @@ recipe = zc.recipe.egg
 eggs = i18ndude
 
 
+[vscode]
+recipe = collective.recipe.vscode
+eggs = ${test:eggs}
+flake8-enabled = false
+black-enabled = true
+generate-envfile = true
+
+
 [versions]
+
+
 # from buildout.coredev qa.cfg 6.0
 flake8 = 3.3.0
 flake8-blind-except = 0.1.1
@@ -145,10 +158,6 @@ check-manifest = 0.34
 # flake8==3.2.1
 configparser = 3.5.0
 
-# Required by:
-# flake8==3.2.1
-enum34 = 1.1.6
-
 # Required by:
 # flake8-isort==2.1.3
 flake8-polyfill = 1.0.1

From 1793be0a17d276423a7e81c522c9234c74487f84 Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 20 Sep 2021 21:53:07 +0200
Subject: [PATCH 37/74] update deps & pinnings

---
 versions.cfg | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/versions.cfg b/versions.cfg
index 2f9b15fd..edd61bba 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -8,17 +8,21 @@ auto-checkout +=
     bda.plone.payment
     bda.plone.orders
     bda.plone.stripe
+    bda.plone.wallee
 
     yafowil.plone
     yafowil.bootstrap
     yafowil.widget.datetime
     yafowil
+    node
+
+    wallee
 
 [versions]
 yafowil = >=2.2b2
 yafowil.plone = >=4.0.0a3
 collective.js.datatables = >=4.1.2
-
+collective.z3cform.datagridfield = 1.5.3
 
 # stripe wants newer request
 requests = >=2.20
@@ -31,6 +35,8 @@ plone.app.robotframework = >=1.2.0
 
 pygments = 2.5.2
 
+cffi = >=1.14.6
+
 [remotes]
 github = git://github.com
 github_push = git@github.com
@@ -42,8 +48,13 @@ bda.plone.cart          = git ${remotes:github}/bluedynamics/bda.plone.cart.git
 bda.plone.payment       = git ${remotes:github}/bluedynamics/bda.plone.payment.git       pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git       branch=bootstrap-plone6
 bda.plone.orders        = git ${remotes:github}/bluedynamics/bda.plone.orders.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git        branch=bootstrap-plone6
 bda.plone.stripe        = git ${remotes:github}/bluedynamics/bda.plone.stripe.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
+bda.plone.wallee        = git ${remotes:github}/bluedynamics/bda.plone.wallee.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.wallee.git       branch=main
 
 yafowil.plone           = git ${remotes:github}/bluedynamics/yafowil.plone.git           pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git           branch=bootstrap-plone6
 yafowil.bootstrap       = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git       branch=2.0
 yafowil.widget.datetime = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime.git branch=bootstrap4
 yafowil                 = git ${remotes:github}/bluedynamics/yafowil.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.git                 branch=3.0
+
+node                    = git ${remotes:github}/conestack/node.git                       pushurl=${remotes:github_push}:conestack/node.git                       branch=master
+
+wallee                  = git ${remotes:github}/bluedynamics/wallee-python-sdk.git        pushurl=${remotes:github_push}:bluedynamics/wallee-python-sdk.git       branch=master

From 104e903fd84d37af65b1d97351def6f8e791145a Mon Sep 17 00:00:00 2001
From: Peter Holzer <peter.holzer@agitator.com>
Date: Mon, 20 Sep 2021 21:53:32 +0200
Subject: [PATCH 38/74] switch to plone6 pre-alpha

---
 plone-6.x.cfg | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plone-6.x.cfg b/plone-6.x.cfg
index 9c2bc55a..d708ea41 100644
--- a/plone-6.x.cfg
+++ b/plone-6.x.cfg
@@ -1,9 +1,8 @@
 [buildout]
 extends =
     base.cfg
-# barceloneta plone 6
-    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/versions.cfg
     https://raw.githubusercontent.com/plone/buildout.coredev/6.0/sources.cfg
-    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/checkouts.cfg
-
+    https://dist.plone.org/release/6.0-dev/versions.cfg
     versions.cfg
+
+find-links = https://dist.plone.org/release/6.0-dev/

From d6fa906e820d8499e41127022e48af6669a9089f Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Mon, 18 Jul 2022 10:17:40 +0200
Subject: [PATCH 39/74] update controlpanel icon

---
 .../shop/profiles/default/controlpanel.xml    |  2 +-
 .../profiles/10_to_11/controlpanel.xml        | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 src/bda/plone/shop/upgrades/profiles/10_to_11/controlpanel.xml

diff --git a/src/bda/plone/shop/profiles/default/controlpanel.xml b/src/bda/plone/shop/profiles/default/controlpanel.xml
index 9e481ff0..c013cdfa 100644
--- a/src/bda/plone/shop/profiles/default/controlpanel.xml
+++ b/src/bda/plone/shop/profiles/default/controlpanel.xml
@@ -11,7 +11,7 @@
     appId="bda.plone.shop"
     category="Products"
     url_expr="string:${portal_url}/@@shop_controlpanel"
-    icon_expr="string:${portal_url}/++resource++shop_icon.png"
+    icon_expr="string:shop"
     visible="True"
     i18n:attributes="title">
     <permission>Manage portal</permission>
diff --git a/src/bda/plone/shop/upgrades/profiles/10_to_11/controlpanel.xml b/src/bda/plone/shop/upgrades/profiles/10_to_11/controlpanel.xml
new file mode 100644
index 00000000..c013cdfa
--- /dev/null
+++ b/src/bda/plone/shop/upgrades/profiles/10_to_11/controlpanel.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<object
+    name="portal_controlpanel"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="bda.plone.shop"
+    purge="False">
+
+  <configlet
+    title="Shop settings"
+    action_id="bdashop"
+    appId="bda.plone.shop"
+    category="Products"
+    url_expr="string:${portal_url}/@@shop_controlpanel"
+    icon_expr="string:shop"
+    visible="True"
+    i18n:attributes="title">
+    <permission>Manage portal</permission>
+  </configlet>
+
+</object>

From 3080ac4092f1ebe8912e11c6f1c3157f1d7c6dce Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Mon, 18 Jul 2022 10:45:04 +0200
Subject: [PATCH 40/74] switch to github actions with mxdev

---
 .github/workflows/main.yml |  40 +++++
 .gitignore                 |   6 +
 .travis.yml                |  39 -----
 Makefile                   | 313 +++++++++++++++++++++++++++++++++++++
 base.cfg                   | 172 --------------------
 bootstrap-6.x.sh           |  23 ---
 constraints.txt            |   1 +
 coredev5.cfg               |   5 -
 mx.ini                     |  66 ++++++++
 plone-6.x.cfg              |   8 -
 relstorage.cfg             |  14 --
 requirements.txt           |   6 +
 travis.cfg                 |  19 ---
 versions.cfg               |  60 -------
 14 files changed, 432 insertions(+), 340 deletions(-)
 create mode 100644 .github/workflows/main.yml
 delete mode 100644 .travis.yml
 create mode 100644 Makefile
 delete mode 100644 base.cfg
 delete mode 100755 bootstrap-6.x.sh
 create mode 100644 constraints.txt
 delete mode 100644 coredev5.cfg
 create mode 100644 mx.ini
 delete mode 100644 plone-6.x.cfg
 delete mode 100644 relstorage.cfg
 create mode 100644 requirements.txt
 delete mode 100644 travis.cfg
 delete mode 100644 versions.cfg

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..ca6bd130
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,40 @@
+name: Test bda.plone.shop
+
+on:
+  push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+        plone:
+          - "6.0-dev"
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}
+        id: setup
+        uses: plone/setup-plone@v1.0.0
+        with:
+          python-version: ${{ matrix.python }}
+          plone-version: ${{ matrix.plone }}
+
+      - name: Install package
+        run: |
+          make install
+
+      - name: Run Lint
+        run: |
+          make lint
+
+      - name: Run tests
+        run: |
+          make test-ignore-warnings
diff --git a/.gitignore b/.gitignore
index 02d814d0..26d7f150 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,9 @@
 lib64
 /.Python
 .python-version
+
+# mxdev
+.make-sentinels/
+sources/
+/*-mxdev.txt
+.installed.txt
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 636613db..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-language: python
-dist: xenial
-sudo: false
-cache:
-  pip: true
-  directories:
-    - eggs
-    - downloads
-services:
-  - xvfb
-matrix:
-  include:
-    - python: 2.7
-      env: PLONE_VERSION=5.1
-    - python: 2.7
-      env: PLONE_VERSION=5.2
-    - python: 3.6
-      env: PLONE_VERSION=5.2
-    - python: 3.7
-      env: PLONE_VERSION=5.2
-install:
-  - sed -ie "s#plone-5.1.x.cfg#plone-$PLONE_VERSION.x.cfg#" travis.cfg
-  - virtualenv .
-  - ./bin/pip install --upgrade pip
-  - ./bin/pip install -r http://dist.plone.org/release/$PLONE_VERSION-latest/requirements.txt
-  - ./bin/buildout -c travis.cfg annotate
-  - ./bin/buildout -t 10 -Nc travis.cfg
-script:
-  - bin/code-analysis
-  - bin/test
-after_success:
-  - bin/coverage.sh
-  - pip install coveralls
-  - coveralls
-after_failure:
-  - bin/csslint --version
-  - bin/jshint --version
-  - bin/jscs --version
-  - firefox -v
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..90e78905
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,313 @@
+# Makefile to configure and run Plone instance
+
+##############################################################################
+# SETUP MAKE
+
+## Defensive settings for make: https://tech.davis-hansson.com/p/make/
+SHELL:=bash
+.ONESHELL:
+# for Makefile debugging purposes add -x to the .SHELLFLAGS
+.SHELLFLAGS:=-eu -o pipefail -O inherit_errexit -c
+.SILENT:
+.DELETE_ON_ERROR:
+MAKEFLAGS+=--warn-undefined-variables
+MAKEFLAGS+=--no-builtin-rules
+
+# Colors
+# OK=Green, warn=yellow, error=red
+ifeq ($(TERM),)
+# no colors if not in terminal
+	MARK_COLOR=
+	OK_COLOR=
+	WARN_COLOR=
+	ERROR_COLOR=
+	NO_COLOR=
+else
+	MARK_COLOR=`tput setaf 6`
+	OK_COLOR=`tput setaf 2`
+	WARN_COLOR=`tput setaf 3`
+	ERROR_COLOR=`tput setaf 1`
+	NO_COLOR=`tput sgr0`
+endif
+
+##############################################################################
+# SETTINGS AND VARIABLE
+# adjust to your project needs
+PROJECT_NAME=bda.plone.shop
+IMAGE_NAME=${PROJECT_NAME}
+CONSTRAINTS=constraints.txt
+PIP_REQUIREMENTS_IN_FILE=requirements.txt
+ADDONBASE=./
+ADDONFOLDER=${ADDONBASE}src/
+# it is possible to define an alternative YAML file for the the instance.set default i
+INSTANCE_YAML?=instance.yaml
+INSTANCE_FOLDER?=instance
+
+PIP_PARAMS= --pre
+
+##############################################################################
+# targets and prerequisites
+# target has to be one file, otherwise step gets executes for each file separate
+PREPARE_PREREQUISITES=${PIP_REQUIREMENTS_IN_FILE} ${CONSTRAINTS} mx.ini ${ADDONBASE}setup.cfg
+PREPARE_TARGET=requirements-mxdev.txt
+INSTALL_PREREQUSISTES=${PREPARE_TARGET}
+INSTALL_TARGET=.installed.txt
+INSTANCE_PREREQUISITES=${INSTALL_TARGET} ${INSTANCE_YAML}
+INSTANCE_TARGET=${INSTANCE_FOLDER}/etc/zope.ini ${INSTANCE_FOLDER}/etc/zope.conf ${INSTANCE_FOLDER}/etc/site.zcml
+TEST_PREREQUISITES=${INSTALL_TARGET}
+RUN_PREREQUISITES=${INSTANCE_TARGET}
+
+##############################################################################
+# CONVINIENCE
+
+# install and run
+.PHONY: all # full install, test and run
+all:style test run
+
+# Add the following 'help' target to your Makefile
+# And add help text after each target name starting with '\#\#'
+.PHONY: help
+help: ## This help message
+	@echo "${OK_COLOR}This is the Makefile for ${WARN_COLOR}${PROJECT_NAME}${NO_COLOR}"
+	@echo
+	@echo "${WARN_COLOR}Additional parameters:${NO_COLOR}"
+	@echo "${MARK_COLOR}PYTHON${NO_COLOR}:      Python interpreter to be used (default: python3)"
+	@echo "${MARK_COLOR}VENV${NO_COLOR}:        [on|off] wether to create a Python virtual environment or not (default: on)"s
+	@echo "${MARK_COLOR}VENV_FOLDER${NO_COLOR}: location of the virtual environment (default: ./venv)"
+	@echo
+	@echo "${WARN_COLOR}Targets:${NO_COLOR}"
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+##############################################################################
+# targets and prerequisites
+# target has to be one file, otherwise step gets executes for each file separate
+PREPARE_PREREQUISITES=${PIP_REQUIREMENTS_IN_FILE} ${CONSTRAINTS} mx.ini ${ADDONBASE}setup.cfg
+PREPARE_TARGET=requirements-mxdev.txt
+INSTALL_PREREQUSISTES=${PREPARE_TARGET}
+INSTALL_TARGET=.installed.txt
+INSTANCE_PREREQUISITES=${INSTALL_TARGET} ${INSTANCE_YAML}
+INSTANCE_TARGET=${INSTANCE_FOLDER}/etc/zope.ini ${INSTANCE_FOLDER}/etc/zope.conf ${INSTANCE_FOLDER}/etc/site.zcml
+TEST_PREREQUISITES=${INSTALL_TARGET}
+RUN_PREREQUISITES=${INSTANCE_TARGET}
+
+##############################################################################
+# BASE
+
+SENTINELFOLDER=.make-sentinels/
+SENTINEL=${SENTINELFOLDER}ABOUT.txt
+${SENTINEL}:
+	@mkdir -p ${SENTINELFOLDER}
+	@echo "Sentinels for the Makefile process." > ${SENTINEL}
+
+# PYTHON, VENV, PIP
+# venv and pybin
+PYTHON?=python3
+VENV?=on
+ifeq ("${VENV}", "on")
+	VENV_FOLDER?=./venv
+	PYBIN=${VENV_FOLDER}/bin/
+else
+	VENV_FOLDER?=
+	ifneq ("${VENV_FOLDER}", "")
+		PYBIN=${VENV_FOLDER}/bin/
+		PYTHON=${PYBIN}python
+	else
+		PYBIN=
+	endif
+endif
+
+# installed?
+ifeq (, $(shell which $(PYTHON) ))
+  $(error "PYTHON=$(PYTHON) not found in $(PATH)")
+endif
+
+# version ok?
+PYTHON_VERSION_MIN=3.7
+PYTHON_VERSION_OK=$(shell $(PYTHON) -c 'import sys; print(int(sys.version_info[0:2] >= tuple(map(int, "$(PYTHON_VERSION_MIN)".split(".")))))' )
+
+ifeq ($(PYTHON_VERSION_OK),0)
+  $(error "Need python $(PYTHON_VERSION) >= $(PYTHON_VERSION_MIN)")
+endif
+
+VENV_SENTINEL=${SENTINELFOLDER}venv.sentinel
+${VENV_SENTINEL}: ${SENTINEL}
+ifeq ("${VENV}", "on")
+	@echo "$(OK_COLOR)Setup Python Virtual Environment under '${VENV_FOLDER}' $(NO_COLOR)"
+	@${PYTHON} -m venv ${VENV_FOLDER}
+else
+	@echo "$(OK_COLOR)Use current local or global Python: `which ${PYTHON}` $(NO_COLOR)"
+endif
+	@touch ${VENV_SENTINEL}
+
+PIP_SENTINEL=${SENTINELFOLDER}pip.sentinel
+${PIP_SENTINEL}: ${VENV_SENTINEL} ${CONSTRAINTS} ${SENTINEL}
+	@echo "$(OK_COLOR)Install pip$(NO_COLOR)"
+	@${PYBIN}pip install -U "pip>=22.0.2" wheel setuptools
+	@touch ${PIP_SENTINEL}
+
+##############################################################################
+# MXDEV
+
+MXDEV_SENTINEL=${SENTINELFOLDER}pip-mxdev.sentinel
+${MXDEV_SENTINEL}: ${PIP_SENTINEL}
+	@echo "$(OK_COLOR)Install mxdev$(NO_COLOR)"
+	@${PYBIN}pip install "mxdev==2.1.0" "libvcs==0.11.1"
+	@touch ${MXDEV_SENTINEL}
+
+.PHONY: prepare
+prepare: ${PREPARE_TARGET} ## prepare soures and dependencies
+
+${PREPARE_PREREQUISITES}:
+	@touch $@
+
+${PREPARE_TARGET}: ${MXDEV_SENTINEL} ${PREPARE_PREREQUISITES}
+	@echo "$(OK_COLOR)Prepare sources and dependencies$(NO_COLOR)"
+	@${PYBIN}mxdev -c mx.ini
+
+.PHONY: install
+install: ${INSTALL_TARGET} ## pip install all dependencies and scripts
+
+${INSTALL_TARGET}: ${PREPARE_TARGET}
+	@echo "$(OK_COLOR)Install dependencies and scripts$(NO_COLOR)"
+	@${PYBIN}pip install -r ${PREPARE_TARGET} ${PIP_PARAMS}
+	@${PYBIN}pip freeze >${INSTALL_TARGET}
+
+##############################################################################
+# INSTANCE
+
+COOKIECUTTER_SENTINEL=${SENTINELFOLDER}pip-cookiecutter.sentinel
+${COOKIECUTTER_SENTINEL}:
+	@echo "$(OK_COLOR)Install cookiecutter$(NO_COLOR)"
+	@${PYBIN}pip install "cookiecutter>=2.1.1"
+	@touch ${COOKIECUTTER_SENTINEL}
+
+${INSTANCE_YAML}:
+	@touch ${INSTANCE_YAML}
+
+.PHONY: instance
+instance: ${INSTANCE_TARGET} ## create configuration for an zope (plone) instance
+
+${INSTANCE_TARGET}: ${INSTANCE_PREREQUISITES} ${COOKIECUTTER_SENTINEL} ${INSTANCE_YAML}
+	@echo "$(OK_COLOR)Create Plone/Zope configuration from ${INSTANCE_YAML} at ${INSTANCE_FOLDER}$(NO_COLOR)"
+	@${PYBIN}cookiecutter -f --no-input --config-file ${INSTANCE_YAML} https://github.com/plone/cookiecutter-zope-instance
+
+
+##############################################################################
+# TESTING
+
+TESTRUNNER_SENTINEL=${SENTINELFOLDER}pip-testrunner.sentinel
+${TESTRUNNER_SENTINEL}: ${PIP_SENTINEL}
+	@echo "$(OK_COLOR)Install zope.testrunner$(NO_COLOR)"
+	@${PYBIN}pip install zope.testrunner
+	@touch ${TESTRUNNER_SENTINEL}
+
+.PHONY: test
+test: ${TEST_PREREQUISITES} ${TESTRUNNER_SENTINEL} ## run tests
+	@echo "$(OK_COLOR)Run addon tests$(NO_COLOR)"
+	@${PYBIN}zope-testrunner --auto-color --auto-progress --test-path=${ADDONFOLDER}
+
+.PHONY: test-ignore-warnings
+test-ignore-warnings: ${TEST_PREREQUISITES} ${TESTRUNNER_SENTINEL}  ## run tests (hide warnings)
+	@echo "$(OK_COLOR)Run addon tests$(NO_COLOR)"
+	@PYTHONWARNINGS=ignore ${PYBIN}zope-testrunner --auto-color --auto-progress --test-path=${ADDONFOLDER}
+
+##############################################################################
+# CODE FORMATTING
+
+BLACK_SENTINEL=${SENTINELFOLDER}pip-black.sentinel
+${BLACK_SENTINEL}: ${PREPARE_TARGET}
+	@echo "$(OK_COLOR)Install black$(NO_COLOR)"
+	@${PYBIN}pip install black
+	@touch ${BLACK_SENTINEL}
+
+ISORT_SENTINEL=${SENTINELFOLDER}pip-isort.sentinel
+${ISORT_SENTINEL}: ${PREPARE_TARGET}
+	@echo "$(OK_COLOR)Install isort$(NO_COLOR)"
+	@${PYBIN}pip install isort
+	@touch ${ISORT_SENTINEL}
+
+ZPRETTY_SENTINEL=${SENTINELFOLDER}pip-zpretty.sentinel
+${ZPRETTY_SENTINEL}: ${PREPARE_TARGET}
+	@echo "$(OK_COLOR)Install zpretty$(NO_COLOR)"
+	@${PYBIN}pip install "zpretty>=2.2.0"
+	@touch ${ZPRETTY_SENTINEL}
+
+.PHONY: apply-style-black
+apply-style-black: ${BLACK_SENTINEL}  ## apply/format code style black (to Python files)
+	@echo "$(OK_COLOR)Apply style black rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
+	@${PYBIN}black ${ADDONFOLDER}
+
+.PHONY: apply-style-isort
+apply-style-isort: ${ISORT_SENTINEL} ## apply/format code style isort (sorted imports in Python files)
+	@echo "$(OK_COLOR)Apply style isort rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
+	@${PYBIN}isort ${ADDONFOLDER}
+
+.PHONY: apply-style-zpretty
+apply-style-zpretty: ${ZPRETTY_SENTINEL}   ## apply/format code style zpretty (to XML/ZCML files)
+	@echo "$(OK_COLOR)Apply style zpretty rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
+	@find ${ADDONFOLDER} -name '*.zcml' -exec ${PYBIN}zpretty -iz {} +
+	@find ${ADDONFOLDER} -name "*.xml"|grep -v locales|xargs ${PYBIN}zpretty -ix
+
+.PHONY: style ## apply code styles black, isort and zpretty
+style: apply-style-black apply-style-isort
+
+.PHONY: format ## alias for "style"
+FORMATTING: style
+
+.PHONY: lint-black
+lint-black: ${BLACK_SENTINEL}  ## lint code-style black (to Python files)
+	@echo "$(OK_COLOR)Lint black rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
+	@${PYBIN}black --check ${ADDONFOLDER}
+
+.PHONY: lint-isort
+lint-isort: ${ISORT_SENTINEL} ## lint code-style isort (sorted imports in Python files)
+	@echo "$(OK_COLOR)Lint style isort rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
+	@${PYBIN}isort --check-only ${ADDONFOLDER}
+
+.PHONY: lint-zpretty
+lint-zpretty: ${ZPRETTY_SENTINEL}   ## lint code-style zpretty (to XML/ZCML files)
+	@echo "$(OK_COLOR)Lint style zpretty rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
+	@find ${ADDONFOLDER} -name '*.zcml' -exec ${PYBIN}zpretty --check -z {} +
+	@find ${ADDONFOLDER} -name '*.xml'|grep -v locales|xargs ${PYBIN}zpretty --check -x
+
+.PHONY: lint ## lint all: check if complies with code-styles black, isort and zpretty
+lint: lint-black lint-isort
+
+##############################################################################
+# RUN
+
+.PHONY: run
+run: ${RUN_PREREQUISITES} ## run/start Plone
+	@echo "$(OK_COLOR)Run Plone$(NO_COLOR)"
+	@${PYBIN}runwsgi -v instance/etc/zope.ini
+
+##############################################################################
+# CLEAN
+.PHONY: clean-venv
+clean-venv: ## remove Python virtual environment
+ifeq ("${VENV}", "on")
+	@echo "$(OK_COLOR)Remove Virtualenv.$(NO_COLOR)"
+	rm -rf ${VENV_FOLDER} ${SENTINELFOLDER}/pip*.sentinel ${VENV_SENTINEL}
+else:
+	@echo "$(OK_WARN)No self-created Python virtualenv at '${VENV_FOLDER}'! Nothing to do.$(NO_COLOR)"
+endif
+
+.PHONY: clean-pyc
+clean-pyc: ## remove Python file artifacts
+	@echo "$(OK_COLOR)Remove Python file artifacts (like byte-code) of code in current directory.$(NO_COLOR)"
+	find . -name '*.pyc' -exec rm -f {} +
+	find . -name '*.pyo' -exec rm -f {} +
+	find . -name '*~' -exec rm -f {} +
+	find . -name '__pycache__' -exec rm -fr {} +
+
+.PHONY: clean-make
+clean-make:  ## remove make artifact	@echo "$(OK_COLOR)Remove Plone/Zope configuration (keeps data) and sentinel files.$(NO_COLOR)"
+	rm -rf ${INSTALL_PREREQUSISTES} ${INSTANCE_TARGET} ${SENTINELFOLDER} constraints-mxdev.txt
+
+.PHONY: clean-instance
+clean-instance:  ## remove instance configuration (keeps data)
+	@echo "$(OK_COLOR)Remove Plone/Zope configuration (keeps data) and sentinel files.$(NO_COLOR)"
+	rm -f ${INSTANCE_TARGET}
+
+.PHONY: clean
+clean:  clean-venv clean-pyc clean-make clean-instance   ## clean all (except local database and pip installed packages)
diff --git a/base.cfg b/base.cfg
deleted file mode 100644
index 97684189..00000000
--- a/base.cfg
+++ /dev/null
@@ -1,172 +0,0 @@
-[buildout]
-parts =
-    instance
-    omelette
-    coverage
-    test
-    robot
-    test-coverage
-    releaser
-    code-analysis
-    i18ndude
-    vscode
-
-
-git-clone-depth = 50
-
-develop = .
-unzip = true
-
-package-min-coverage = 80
-
-[code-analysis]
-recipe = plone.recipe.codeanalysis
-multiprocessing = True
-directory = src
-pre-commit-hook = False
-jenkins = True
-check-manifest = True
-clean-lines = True
-# With line breaks and binary operators you will always hit one of these:
-# W503: Line break occurred before a binary operator
-# W504: Line break occurred after a binary operator
-# The pep8 guidelines were changed to recommend the line break before.
-# See https://lintlyci.github.io/Flake8Rules/rules/W503.html
-flake8-ignore = W503
-# keep this list in sync with what plone.recipe.codeanalysis defines
-# on its [recommended] extra, see:
-# https://github.com/plone/plone.recipe.codeanalysis/blob/master/setup.py
-flake8-extensions =
-    flake8-blind-except
-    flake8-coding
-    flake8-commas
-    flake8-debugger
-    flake8-deprecated
-    flake8-isort
-    flake8-pep3101
-    flake8-plone-hasattr
-    flake8-print
-    flake8-quotes
-    flake8-string-format
-    flake8-todo
-
-[instance]
-recipe = plone.recipe.zope2instance
-user = admin:admin
-http-address = 8080
-debug-mode = on
-verbose-security = off
-deprecation-warnings = on
-blob-storage = var/blobstorage
-zodb-temporary-storage = off
-environment-vars =
-    zope_i18n_compile_mo_files true
-
-eggs =
-    bda.plone.shop
-    bda.plone.stripe
-    bda.plone.wallee
-
-
-[releaser]
-recipe = zc.recipe.egg
-eggs = zest.releaser[recommended]
-
-[test]
-recipe = zc.recipe.testrunner
-eggs =
-    bda.plone.cart[test]
-    bda.plone.checkout[test]
-    bda.plone.discount[test]
-    bda.plone.orders[test]
-    bda.plone.payment[test]
-    bda.plone.shop[test]
-
-[robot]
-recipe = zc.recipe.egg
-eggs =
-    ${test:eggs}
-    plone.app.robotframework
-    plone.reload
-    plone.app.debugtoolbar
-    Products.PrintingMailHost
-
-[coverage]
-recipe = zc.recipe.egg
-eggs = coverage
-
-[test-coverage]
-recipe = collective.recipe.template
-input = inline:
-    #!/bin/bash
-    ${buildout:directory}/bin/coverage run --source=${buildout:directory}/src/bda/plone/shop bin/test
-    ${buildout:directory}/bin/coverage html
-    ${buildout:directory}/bin/coverage report -m --fail-under=90
-    # Fail (exit status 1) if coverage returns exit status 2 (this happens
-    # when test coverage is below 100%.
-output = ${buildout:directory}/bin/test-coverage
-mode = 755
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs =
-    ${instance:eggs}
-ignore-develop = true
-
-[i18ndude]
-unzip = true
-recipe = zc.recipe.egg
-eggs = i18ndude
-
-
-[vscode]
-recipe = collective.recipe.vscode
-eggs = ${test:eggs}
-flake8-enabled = false
-black-enabled = true
-generate-envfile = true
-
-
-[versions]
-
-
-# from buildout.coredev qa.cfg 6.0
-flake8 = 3.3.0
-flake8-blind-except = 0.1.1
-flake8-coding = 1.3.0
-flake8-commas = 0.4.3
-flake8-debugger = 1.4.0
-flake8-deprecated = 1.2
-flake8-isort = 2.2.1
-flake8-pep3101 = 1.1
-flake8-plone-hasattr = 0.2.post0
-flake8-print = 2.0.2
-flake8-quotes = 0.11.0
-flake8-string-format = 0.2.3
-flake8-todo = 0.7
-mccabe = 0.6.1
-plone.recipe.codeanalysis = 2.2
-pycodestyle = 2.3.1
-pyflakes = 1.5.0
-zc.recipe.egg = 2.0.3
-
-# Required by:
-# plone.recipe.codeanalysis==2.2
-check-manifest = 0.34
-
-# Required by:
-# flake8==3.2.1
-configparser = 3.5.0
-
-# Required by:
-# flake8-isort==2.1.3
-flake8-polyfill = 1.0.1
-
-# Required by:
-# flake8-isort==2.1.3
-testfixtures = 4.13.1
-
-# Required by:
-# flake8-isort==2.2.1
-isort = 4.2.15
-
diff --git a/bootstrap-6.x.sh b/bootstrap-6.x.sh
deleted file mode 100755
index 4401c137..00000000
--- a/bootstrap-6.x.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-REQUIREMENTS="https://raw.githubusercontent.com/plone/buildout.coredev/6.0/requirements.txt"
-
-for dir in lib include local bin share pyvenv.cfg lib64; do
-    if [ -d "$dir" ]; then
-        echo "Removing $dir..."
-        rm -r "$dir"
-    fi
-done
-
-if [ "$1" == "venv" ]; then
-    ln -fs plone-6.x.cfg buildout.cfg
-    python3 -m venv .
-    ./bin/pip install -r $REQUIREMENTS
-    ./bin/buildout
-else
-    pyenv virtualenv 3.9.6 bda.plone6.shop
-    pyenv local bda.plone6.shop
-    pip install -r $REQUIREMENTS
-    buildout
-fi
diff --git a/constraints.txt b/constraints.txt
new file mode 100644
index 00000000..c0e8f2f6
--- /dev/null
+++ b/constraints.txt
@@ -0,0 +1 @@
+-c https://dist.plone.org/release/6.0-dev/constraints.txt
diff --git a/coredev5.cfg b/coredev5.cfg
deleted file mode 100644
index 530b012e..00000000
--- a/coredev5.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[buildout]
-extends =
-    https://raw.githubusercontent.com/plone/buildout.coredev/5.1/versions.cfg
-    https://raw.githubusercontent.com/plone/buildout.coredev/5.1/sources.cfg
-    https://raw.githubusercontent.com/plone/buildout.coredev/5.1/checkouts.cfg
diff --git a/mx.ini b/mx.ini
new file mode 100644
index 00000000..0cb10217
--- /dev/null
+++ b/mx.ini
@@ -0,0 +1,66 @@
+[settings]
+# This is a mxdev configuration file
+#
+# available options are documented at
+# https://pypi.org/project/mxdev/
+#
+# read also README_MAKE.md in this folder
+#
+requirements-in = requirements.txt
+requirements-out = requirements-mxdev.txt
+
+# ignore own dev-package from existing constraints
+# because it is pinned in the plone-release
+ignores =
+    bda.plone.shop
+
+version-overrides =
+    webresource==1.1
+
+# default-install-mode = direct
+
+# variables
+; github = git+ssh://git@github.com
+github = git+https://github.com
+
+[bda.plone.cart]
+url = ${settings:github}/bluedynamics/bda.plone.cart.git
+branch = bootstrap-plone6
+
+[bda.plone.checkout]
+url = ${settings:github}/bluedynamics/bda.plone.checkout.git
+branch = bootstrap-plone6
+
+[bda.plone.discount]
+url = ${settings:github}/bluedynamics/bda.plone.discount.git
+branch = bootstrap-plone6
+
+[bda.plone.payment]
+url = ${settings:github}/bluedynamics/bda.plone.payment.git
+branch = bootstrap-plone6
+
+[bda.plone.orders]
+url = ${settings:github}/bluedynamics/bda.plone.orders.git
+branch = bootstrap-plone6
+
+# [bda.plone.stripe]
+# url = ${settings:github}/bluedynamics/bda.plone.stripe.git
+# branch = main
+# install-mode = skip
+
+# [bda.plone.wallee]
+# url = ${settings:github}/bluedynamics/bda.plone.wallee.git
+# branch = main
+# install-mode = skip
+
+[yafowil.plone]
+url = ${settings:github}/bluedynamics/yafowil.plone.git
+branch = bootstrap-plone6
+
+[yafowil.bootstrap]
+url = ${settings:github}/bluedynamics/yafowil.bootstrap.git
+branch = 2.0
+
+[yafowil]
+url = ${settings:github}/bluedynamics/yafowil.git
+branch = master
diff --git a/plone-6.x.cfg b/plone-6.x.cfg
deleted file mode 100644
index d708ea41..00000000
--- a/plone-6.x.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[buildout]
-extends =
-    base.cfg
-    https://raw.githubusercontent.com/plone/buildout.coredev/6.0/sources.cfg
-    https://dist.plone.org/release/6.0-dev/versions.cfg
-    versions.cfg
-
-find-links = https://dist.plone.org/release/6.0-dev/
diff --git a/relstorage.cfg b/relstorage.cfg
deleted file mode 100644
index 63f4049c..00000000
--- a/relstorage.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[buildout]
-extends = buildout.cfg
-
-# Read documentation of rel storage how to setup the database
-
-[instance]
-eggs +=
-    psycopg2
-    RelStorage
-rel-storage =
-    type postgresql
-    dsn dbname='zodb' user='zodbuser' host='localhost' password='zodb'
-    blob-dir ${buildout:directory}/var/blobstorage
-    keep-history false
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..b07ce566
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,6 @@
+-e .[test] --install-option="--pre"
+-r https://dist.plone.org/release/6.0-dev/requirements.txt
+-c constraints.txt
+
+# WSGI: A system for configuration of WSGI web components in declarative .ini format.
+Paste
diff --git a/travis.cfg b/travis.cfg
deleted file mode 100644
index 034b4318..00000000
--- a/travis.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-[buildout]
-extends = plone-5.1.x.cfg
-parts =
-    code-analysis
-    coverage
-    test
-
-always-checkout = false
-
-[code-analysis]
-recipe = plone.recipe.codeanalysis
-directory = ${buildout:directory}/src
-return-status-codes = True
-flake8-ignore = C901,E241,F402,E501,W503,E203
-flake8-max-complexity = 20
-clean-lines = False
-imports = True
-debug-statements = True
-utf8-header = True
\ No newline at end of file
diff --git a/versions.cfg b/versions.cfg
deleted file mode 100644
index edd61bba..00000000
--- a/versions.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-[buildout]
-extensions = mr.developer
-sources-dir = ${buildout:directory}/devsrc
-auto-checkout +=
-    bda.plone.discount
-    bda.plone.checkout
-    bda.plone.cart
-    bda.plone.payment
-    bda.plone.orders
-    bda.plone.stripe
-    bda.plone.wallee
-
-    yafowil.plone
-    yafowil.bootstrap
-    yafowil.widget.datetime
-    yafowil
-    node
-
-    wallee
-
-[versions]
-yafowil = >=2.2b2
-yafowil.plone = >=4.0.0a3
-collective.js.datatables = >=4.1.2
-collective.z3cform.datagridfield = 1.5.3
-
-# stripe wants newer request
-requests = >=2.20
-
-node = >=0.9.23
-plumber = >=1.5
-
-docutils = >=0.13.1
-plone.app.robotframework = >=1.2.0
-
-pygments = 2.5.2
-
-cffi = >=1.14.6
-
-[remotes]
-github = git://github.com
-github_push = git@github.com
-
-[sources]
-bda.plone.discount      = git ${remotes:github}/bluedynamics/bda.plone.discount.git      pushurl=${remotes:github_push}:bluedynamics/bda.plone.discount.git      branch=bootstrap-plone6
-bda.plone.checkout      = git ${remotes:github}/bluedynamics/bda.plone.checkout.git      pushurl=${remotes:github_push}:bluedynamics/bda.plone.checkout.git      branch=bootstrap-plone6
-bda.plone.cart          = git ${remotes:github}/bluedynamics/bda.plone.cart.git          pushurl=${remotes:github_push}:bluedynamics/bda.plone.cart.git          branch=bootstrap-plone6
-bda.plone.payment       = git ${remotes:github}/bluedynamics/bda.plone.payment.git       pushurl=${remotes:github_push}:bluedynamics/bda.plone.payment.git       branch=bootstrap-plone6
-bda.plone.orders        = git ${remotes:github}/bluedynamics/bda.plone.orders.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.orders.git        branch=bootstrap-plone6
-bda.plone.stripe        = git ${remotes:github}/bluedynamics/bda.plone.stripe.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.stripe.git
-bda.plone.wallee        = git ${remotes:github}/bluedynamics/bda.plone.wallee.git        pushurl=${remotes:github_push}:bluedynamics/bda.plone.wallee.git       branch=main
-
-yafowil.plone           = git ${remotes:github}/bluedynamics/yafowil.plone.git           pushurl=${remotes:github_push}:bluedynamics/yafowil.plone.git           branch=bootstrap-plone6
-yafowil.bootstrap       = git ${remotes:github}/bluedynamics/yafowil.bootstrap.git       pushurl=${remotes:github_push}:bluedynamics/yafowil.bootstrap.git       branch=2.0
-yafowil.widget.datetime = git ${remotes:github}/bluedynamics/yafowil.widget.datetime.git pushurl=${remotes:github_push}:bluedynamics/yafowil.widget.datetime.git branch=bootstrap4
-yafowil                 = git ${remotes:github}/bluedynamics/yafowil.git                 pushurl=${remotes:github_push}:bluedynamics/yafowil.git                 branch=3.0
-
-node                    = git ${remotes:github}/conestack/node.git                       pushurl=${remotes:github_push}:conestack/node.git                       branch=master
-
-wallee                  = git ${remotes:github}/bluedynamics/wallee-python-sdk.git        pushurl=${remotes:github_push}:bluedynamics/wallee-python-sdk.git       branch=master

From 03488ef0b67d7cc0f906ecc3082b589c825037ec Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Mon, 18 Jul 2022 10:52:58 +0200
Subject: [PATCH 41/74] make style

---
 setup.cfg                                  |   3 +-
 src/bda/plone/shop/__init__.py             |   4 +-
 src/bda/plone/shop/browser/actions.py      |   8 +-
 src/bda/plone/shop/browser/admin.py        |   7 +-
 src/bda/plone/shop/browser/availability.py |  24 +-
 src/bda/plone/shop/browser/buyable.py      |   2 +-
 src/bda/plone/shop/browser/controlpanel.py |   4 +-
 src/bda/plone/shop/browser/navigation.py   | 174 +++++------
 src/bda/plone/shop/browser/toolbar.py      |   2 +-
 src/bda/plone/shop/cartdata.py             |  54 ++--
 src/bda/plone/shop/dx.py                   | 129 ++++-----
 src/bda/plone/shop/interfaces.py           | 319 ++++++++++-----------
 src/bda/plone/shop/mailnotify.py           |   2 +-
 src/bda/plone/shop/setuphandlers.py        |   6 +-
 src/bda/plone/shop/shipping.py             |  68 ++---
 src/bda/plone/shop/tests/__init__.py       |   4 +-
 src/bda/plone/shop/tests/test_user.py      |   3 +-
 src/bda/plone/shop/upgrades/upgrades.py    |   4 +-
 src/bda/plone/shop/user/properties.py      |  26 +-
 src/bda/plone/shop/user/userdata.py        |  85 +++---
 src/bda/plone/shop/vocabularies.py         |   7 +-
 21 files changed, 430 insertions(+), 505 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1c775eac..f80e612d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,8 +8,7 @@ ignore =
 [isort]
 # for details see
 # http://docs.plone.org/develop/styleguide/python.html#grouping-and-sorting
+profile = black
 force_alphabetical_sort = True
 force_single_line = True
 lines_after_imports = 2
-line_length = 200
-not_skip = __init__.py
diff --git a/src/bda/plone/shop/__init__.py b/src/bda/plone/shop/__init__.py
index 9beda6de..64ff6481 100644
--- a/src/bda/plone/shop/__init__.py
+++ b/src/bda/plone/shop/__init__.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from bda.plone.shop import permissions  # noqa
 from bda.plone.shop.user.properties import UserPropertiesPASPlugin
-from Products.PluggableAuthService.PluggableAuthService import (
+from Products.PluggableAuthService.PluggableAuthService import (  # noqa
     registerMultiPlugin,
-)  # noqa
+)
 from zope.i18nmessageid import MessageFactory
 
 
diff --git a/src/bda/plone/shop/browser/actions.py b/src/bda/plone/shop/browser/actions.py
index 061866ca..e091fc45 100644
--- a/src/bda/plone/shop/browser/actions.py
+++ b/src/bda/plone/shop/browser/actions.py
@@ -45,15 +45,15 @@ def isPossibleToDisableFeature(self):
 class BuyableAction(EnableDisableFeature):
     feature_iface = IBuyable
     potential_feature_iface = IPotentiallyBuyable
-    enable_message = _(u"enabled_buyable", u"Enabled Buyable.")
-    disable_message = _(u"disabled_buyable", u"Disabled Buyable.")
+    enable_message = _("enabled_buyable", "Enabled Buyable.")
+    disable_message = _("disabled_buyable", "Disabled Buyable.")
 
 
 class VendorAction(EnableDisableFeature):
     feature_iface = IVendor
     potential_feature_iface = IContainer
-    enable_message = _(u"enabled_vendor", u"Enabled Vendor.")
-    disable_message = _(u"disabled_vendor", u"Disabled Vendor.")
+    enable_message = _("enabled_vendor", "Enabled Vendor.")
+    disable_message = _("disabled_vendor", "Disabled Vendor.")
 
     def enableFeature(self):
         self.context.manage_permission(
diff --git a/src/bda/plone/shop/browser/admin.py b/src/bda/plone/shop/browser/admin.py
index af4508ec..cd6c4539 100644
--- a/src/bda/plone/shop/browser/admin.py
+++ b/src/bda/plone/shop/browser/admin.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from bda.plone.shop import message_factory as _
 from bda.plone.shop.browser.navigation import ShopNavigation
 from plone.app.portlets.portlets import base
 from plone.portlets.interfaces import IPortletDataProvider
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zope.interface import implementer
 
 import pkg_resources
@@ -16,13 +16,12 @@
 
 
 class IShopAdminPortlet(IPortletDataProvider):
-    """A portlet rendering shop portlet links.
-    """
+    """A portlet rendering shop portlet links."""
 
 
 @implementer(IShopAdminPortlet)
 class ShopAdminAssignment(base.Assignment):
-    title = _(u"shop_portlet", default=u"Shop Portlet")
+    title = _("shop_portlet", default="Shop Portlet")
 
 
 class ShopAdminRenderer(base.Renderer, ShopNavigation):
diff --git a/src/bda/plone/shop/browser/availability.py b/src/bda/plone/shop/browser/availability.py
index b1f11178..12ed0991 100644
--- a/src/bda/plone/shop/browser/availability.py
+++ b/src/bda/plone/shop/browser/availability.py
@@ -100,8 +100,8 @@ def full_available_message(self):
             if not get_item_data_provider(self.context).quantity_unit_float:
                 available = int(available)
         message = _(
-            u"full_available_message",
-            default=u"${available} items(s) available.",
+            "full_available_message",
+            default="${available} items(s) available.",
             mapping={"available": available},
         )
         return message
@@ -112,8 +112,8 @@ def critical_available_message(self):
         if not get_item_data_provider(self.context).quantity_unit_float:
             available = int(available)
         message = _(
-            u"critical_available_message",
-            default=u"Just ${available} items(s) left.",
+            "critical_available_message",
+            default="Just ${available} items(s) left.",
             mapping={"available": available},
         )
         return message
@@ -129,10 +129,10 @@ def overbook_available_message(self):
             if not get_item_data_provider(self.context).quantity_unit_float:
                 reservable = int(reservable)
         message = _(
-            u"overbook_available_message",
-            default=u"Item is sold out. You can pre-order "
-            u"${reservable} items. As soon as item is "
-            u"available again, it gets delivered.",
+            "overbook_available_message",
+            default="Item is sold out. You can pre-order "
+            "${reservable} items. As soon as item is "
+            "available again, it gets delivered.",
             mapping={"reservable": reservable},
         )
         return message
@@ -146,8 +146,8 @@ def purchasable_until_message(self):
             request=self.request,
         )
         message = _(
-            u"purchasable_until_message",
-            default=u"Item is purchasable until ${date}",
+            "purchasable_until_message",
+            default="Item is purchasable until ${date}",
             mapping={"date": date},
         )
         return message
@@ -161,8 +161,8 @@ def purchasable_as_of_message(self):
             request=self.request,
         )
         message = _(
-            u"purchasable_as_of_message",
-            default=u"Item is purchasable as of ${date}",
+            "purchasable_as_of_message",
+            default="Item is purchasable as of ${date}",
             mapping={"date": date},
         )
         return message
diff --git a/src/bda/plone/shop/browser/buyable.py b/src/bda/plone/shop/browser/buyable.py
index 12bd12f9..bbd91ef4 100644
--- a/src/bda/plone/shop/browser/buyable.py
+++ b/src/bda/plone/shop/browser/buyable.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from AccessControl import getSecurityManager
 from bda.plone.cart import CURRENCY_LITERALS
+from bda.plone.cart.browser import DataProviderMixin
 from bda.plone.cart.cart import get_data_provider
 from bda.plone.cart.cartitem import get_item_availability
 from bda.plone.cart.cartitem import get_item_data_provider
-from bda.plone.cart.browser import DataProviderMixin
 from bda.plone.shop import permissions
 from bda.plone.shop.interfaces import IBuyablePeriod
 from datetime import datetime
diff --git a/src/bda/plone/shop/browser/controlpanel.py b/src/bda/plone/shop/browser/controlpanel.py
index 2c996160..7c251d9c 100644
--- a/src/bda/plone/shop/browser/controlpanel.py
+++ b/src/bda/plone/shop/browser/controlpanel.py
@@ -46,8 +46,8 @@ def __getattr__(self, name):
 
 class ShopSettingsEditForm(controlpanel.RegistryEditForm):
     schema = IShopSettings
-    label = _(u"Shop settings")
-    description = _(u"")
+    label = _("Shop settings")
+    description = _("")
 
     def getContent(self):
         interfaces = [self.schema]
diff --git a/src/bda/plone/shop/browser/navigation.py b/src/bda/plone/shop/browser/navigation.py
index 25c68c68..00c8b68f 100644
--- a/src/bda/plone/shop/browser/navigation.py
+++ b/src/bda/plone/shop/browser/navigation.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from Acquisition import aq_inner
 from Acquisition import aq_parent
-from Products.CMFPlone.interfaces import IPloneSiteRoot
 from bda.plone.discount.interfaces import IDiscountSettingsEnabled
 from bda.plone.orders.common import get_vendors_for
 from bda.plone.orders.interfaces import IBuyable
@@ -10,14 +9,15 @@
 from operator import attrgetter
 from plone import api
 from plone.folder.interfaces import IFolder
+from Products.CMFPlone.interfaces import IPloneSiteRoot
 from zope.annotation import IAnnotations
 from zope.component import adapter
 from zope.component import getAdapters
 from zope.component import getMultiAdapter
 from zope.component.interfaces import ISite
 from zope.interface import Attribute
-from zope.interface import Interface
 from zope.interface import implementer
+from zope.interface import Interface
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.security import checkPermission
 
@@ -28,29 +28,27 @@
 
 
 class IShopNavigationLink(Interface):
-    """Adapter interface for providing shop navigation links.
-    """
+    """Adapter interface for providing shop navigation links."""
 
-    id = Attribute(u"Link ID")
-    group = Attribute(u"Navigation group ID")
+    id = Attribute("Link ID")
+    group = Attribute("Navigation group ID")
     permission = Attribute(
-        u"Permissions a user must have on context to view " u"this link"
+        "Permissions a user must have on context to view " "this link"
     )
-    display = Attribute(u"Flag whether to display this link")
-    url = Attribute(u"Target URL of this link")
-    title = Attribute(u"Title of this link")
-    order = Attribute(u"Order in which this link gets rendered")
-    cssclass = Attribute(u"Additional CSS class to render")
+    display = Attribute("Flag whether to display this link")
+    url = Attribute("Target URL of this link")
+    title = Attribute("Title of this link")
+    order = Attribute("Order in which this link gets rendered")
+    cssclass = Attribute("Additional CSS class to render")
 
 
 class IShopNavigationGroup(Interface):
-    """Adapter interface for providing shop navigation groups.
-    """
+    """Adapter interface for providing shop navigation groups."""
 
-    id = Attribute(u"Group ID")
-    title = Attribute(u"Group Title")
-    order = Attribute(u"Group rendering order")
-    available = Attribute(u"Flag whether group navigation links are available")
+    id = Attribute("Group ID")
+    title = Attribute("Group Title")
+    order = Attribute("Group rendering order")
+    available = Attribute("Flag whether group navigation links are available")
 
     def links():
         """Sorted list of ``IShopNavigationLink`` implementing instances
@@ -59,10 +57,9 @@ def links():
 
 
 class IShopNavigation(Interface):
-    """Interface for providing shop navigation API.
-    """
+    """Interface for providing shop navigation API."""
 
-    available = Attribute(u"Flag whether navigation links are available")
+    available = Attribute("Flag whether navigation links are available")
 
     def links():
         """Sorted list of ``IShopNavigationLink`` implementing instances
@@ -70,8 +67,7 @@ def links():
         """
 
     def groups():
-        """Sorted list of ``IShopNavigationGroup`` implementing instances.
-        """
+        """Sorted list of ``IShopNavigationGroup`` implementing instances."""
 
 
 ###############################################################################
@@ -87,16 +83,14 @@ def groups():
 
 
 class NavigationItemLookupMixin(object):
-    """Mixin for navigation links related item lookup.
-    """
+    """Mixin for navigation links related item lookup."""
 
     def __init__(self, context, request):
         self.context = context
         self.request = request
 
     def lookup_navigation_items(self, interface):
-        """Lookup navigation items by interface.
-        """
+        """Lookup navigation items by interface."""
         cache = IAnnotations(self.request)
         cache_key = "NavigationItemLookupMixin.lookup_navigation_items.{}"
         cache_key = cache_key.format(interface.__name__)
@@ -116,8 +110,7 @@ def unsorted_items():
 @implementer(IShopNavigationLink)
 @adapter(Interface, IBrowserRequest)
 class ShopNavigationLink(object):
-    """Abstract shop navigation link.
-    """
+    """Abstract shop navigation link."""
 
     id = None
     group = None
@@ -138,23 +131,20 @@ def __init__(self, context, request):
             self.display = checkPermission(self.permission, self.context)
 
     def context_provides(self, context, interfaces=[]):
-        """Return flag whether context provides one of the given interfaces.
-        """
+        """Return flag whether context provides one of the given interfaces."""
         for iface in interfaces:
             if iface.providedBy(context):
                 return True
         return False
 
     def acquire_context(self, context, interfaces=[]):
-        """Acquire next context parent providing one of the given interfaces.
-        """
+        """Acquire next context parent providing one of the given interfaces."""
         if self.context_provides(context, interfaces=interfaces):
             return context
         return self.acquire_context(aq_parent(context), interfaces=interfaces)
 
     def buyables_in_context(self, context):
-        """Return flag whether context contains buyables.
-        """
+        """Return flag whether context contains buyables."""
         catalog = api.portal.get_tool("portal_catalog")
         path = "/".join(context.getPhysicalPath())
         brains = catalog(path=path, object_provides=IBuyable.__identifier__)
@@ -163,8 +153,7 @@ def buyables_in_context(self, context):
         return False
 
     def context_is_default_page(self, context):
-        """Return flag whether given context is default page in it's container.
-        """
+        """Return flag whether given context is default page in it's container."""
         context = aq_inner(context)
         if IPloneSiteRoot.providedBy(context):
             return False
@@ -177,8 +166,7 @@ def context_is_default_page(self, context):
 @implementer(IShopNavigationGroup)
 @adapter(Interface, IBrowserRequest)
 class ShopNavigationGroup(NavigationItemLookupMixin):
-    """Abstract shop navigation group.
-    """
+    """Abstract shop navigation group."""
 
     id = None
     title = None
@@ -223,13 +211,12 @@ def groups(self):
 
 class OrdersGroup(ShopNavigationGroup):
     id = "shop_orders_group"
-    title = _("orders", default=u"Orders")
+    title = _("orders", default="Orders")
     order = 10
 
 
 class OrdersLink(ShopNavigationLink):
-    """Link for navigating to ``Global Orders`` view.
-    """
+    """Link for navigating to ``Global Orders`` view."""
 
     id = "shop_orders_link"
     group = "shop_orders_group"
@@ -248,23 +235,22 @@ def __init__(self, context, request):
             return
         # set title by context interface
         if IPloneSiteRoot.providedBy(context):
-            self.title = _("orders_global", default=u"Orders (global)")
+            self.title = _("orders_global", default="Orders (global)")
         elif ISite.providedBy(context):
-            self.title = _("orders_site", default=u"Orders (site-wide)")
+            self.title = _("orders_site", default="Orders (site-wide)")
         elif IVendor.providedBy(context):
-            self.title = _("orders_vendor", default=u"Orders (vendor specific)")
+            self.title = _("orders_vendor", default="Orders (vendor specific)")
         # set target URL
         self.url = "{}/@@orders".format(context.absolute_url())
 
 
 class OrdersInContextLink(ShopNavigationLink):
-    """Link for navigating to ``Context Orders`` view.
-    """
+    """Link for navigating to ``Context Orders`` view."""
 
     id = "shop_orders_in_context_link"
     group = "shop_orders_group"
     permission = VIEW_ORDERS
-    title = _("orders_in_context", default=u"Orders in Context")
+    title = _("orders_in_context", default="Orders in Context")
     order = 11
     cssclass = "orders"
 
@@ -291,12 +277,11 @@ def __init__(self, context, request):
 
 
 class OrdersInContainerLink(OrdersInContextLink):
-    """Link for navigating to ``Container Orders`` view.
-    """
+    """Link for navigating to ``Container Orders`` view."""
 
     id = "shop_orders_in_container_link"
     group = "shop_orders_group"
-    title = _("orders_in_container", default=u"Orders in Container")
+    title = _("orders_in_container", default="Orders in Container")
     order = 12
 
     def __init__(self, context, request):
@@ -316,13 +301,12 @@ def __init__(self, context, request):
 
 
 class MyOrdersLink(ShopNavigationLink):
-    """Link for navigating to ``My Orders`` view.
-    """
+    """Link for navigating to ``My Orders`` view."""
 
     id = "shop_myorders_link"
     group = "shop_orders_group"
     permission = VIEW_OWN_ORDERS
-    title = _("my_orders", default=u"My Orders")
+    title = _("my_orders", default="My Orders")
     order = 13
     cssclass = "myorders"
 
@@ -342,13 +326,12 @@ def __init__(self, context, request):
 
 class BookingsGroup(ShopNavigationGroup):
     id = "shop_bookings_group"
-    title = _("bookings", default=u"Bookings")
+    title = _("bookings", default="Bookings")
     order = 20
 
 
 class BookingsLink(ShopNavigationLink):
-    """Link for navigating to ``Global Bookings`` view.
-    """
+    """Link for navigating to ``Global Bookings`` view."""
 
     id = "shop_bookings_link"
     group = "shop_bookings_group"
@@ -367,23 +350,22 @@ def __init__(self, context, request):
             return
         # set title by context interface
         if IPloneSiteRoot.providedBy(context):
-            self.title = _("bookings_global", default=u"Bookings (global)")
+            self.title = _("bookings_global", default="Bookings (global)")
         elif ISite.providedBy(context):
-            self.title = _("bookings_site", default=u"Bookings (site-wide)")
+            self.title = _("bookings_site", default="Bookings (site-wide)")
         elif IVendor.providedBy(context):
-            self.title = _("bookings_vendor", default=u"Bookings (vendor specific)")
+            self.title = _("bookings_vendor", default="Bookings (vendor specific)")
         # set target URL
         self.url = "{}/@@bookings".format(context.absolute_url())
 
 
 class BookingsInContextLink(ShopNavigationLink):
-    """Link for navigating to ``Context Bookings`` view.
-    """
+    """Link for navigating to ``Context Bookings`` view."""
 
     id = "shop_bookings_in_context_link"
     group = "shop_bookings_group"
     permission = VIEW_ORDERS
-    title = _("bookings_in_context", default=u"Bookings in Context")
+    title = _("bookings_in_context", default="Bookings in Context")
     order = 21
     cssclass = "bookings"
 
@@ -410,12 +392,11 @@ def __init__(self, context, request):
 
 
 class BookingsInContainerLink(BookingsInContextLink):
-    """Link for navigating to ``Container Bookings`` view.
-    """
+    """Link for navigating to ``Container Bookings`` view."""
 
     id = "shop_bookings_in_container_link"
     group = "shop_bookings_group"
-    title = _("bookings_in_container", default=u"Bookings in Container")
+    title = _("bookings_in_container", default="Bookings in Container")
     order = 22
 
     def __init__(self, context, request):
@@ -441,18 +422,17 @@ def __init__(self, context, request):
 
 class ContactsGroup(ShopNavigationGroup):
     id = "shop_contacts_group"
-    title = _("contacts", default=u"Contacts")
+    title = _("contacts", default="Contacts")
     order = 30
 
 
 class ContactsLink(ShopNavigationLink):
-    """Link for navigating to ``Contacts`` view.
-    """
+    """Link for navigating to ``Contacts`` view."""
 
     id = "shop_contacts_link"
     group = "shop_contacts_group"
     permission = VIEW_ORDERS
-    title = _("contacts", default=u"Contacts")
+    title = _("contacts", default="Contacts")
     order = 30
     cssclass = "bookings"
 
@@ -476,18 +456,17 @@ def __init__(self, context, request):
 
 class ExportGroup(ShopNavigationGroup):
     id = "shop_export_group"
-    title = _("export", default=u"Export")
+    title = _("export", default="Export")
     order = 40
 
 
 class ExportOrdersLink(ShopNavigationLink):
-    """Link for navigating to ``Export Orders`` view.
-    """
+    """Link for navigating to ``Export Orders`` view."""
 
     id = "shop_export_orders_link"
     group = "shop_export_group"
     permission = EXPORT_ORDERS
-    title = _("exportorders", default=u"Export Orders")
+    title = _("exportorders", default="Export Orders")
     order = 40
     cssclass = "export_orders"
 
@@ -501,13 +480,12 @@ def __init__(self, context, request):
 
 
 class ExportOrdersInContext(ShopNavigationLink):
-    """Link for navigating to ``Export Context Orders`` view.
-    """
+    """Link for navigating to ``Export Context Orders`` view."""
 
     id = "shop_export_orders_in_context_link"
     group = "shop_export_group"
     permission = EXPORT_ORDERS
-    title = _("exportorders_item", default=u"Export Orders on this Item")
+    title = _("exportorders_item", default="Export Orders on this Item")
     order = 41
     cssclass = "export_orders_item"
 
@@ -534,12 +512,11 @@ def __init__(self, context, request):
 
 
 class ExportOrdersInContainerLink(ExportOrdersInContext):
-    """Link for navigating to ``Export Orders in Container`` view.
-    """
+    """Link for navigating to ``Export Orders in Container`` view."""
 
     id = "shop_export_orders_in_container_link"
     group = "shop_export_group"
-    title = _("exportorders_in_container", default=u"Export Orders in Container")
+    title = _("exportorders_in_container", default="Export Orders in Container")
     order = 42
 
     def __init__(self, context, request):
@@ -565,13 +542,12 @@ def __init__(self, context, request):
 
 class MailTemaplatesGroup(ShopNavigationGroup):
     id = "shop_mailtemplates_group"
-    title = _("mailtemplates", default=u"Mail Templates")
+    title = _("mailtemplates", default="Mail Templates")
     order = 50
 
 
 class MailTemplatesLink(ShopNavigationLink):
-    """Link for navigating to ``Mail Templates`` view.
-    """
+    """Link for navigating to ``Mail Templates`` view."""
 
     id = "shop_mail_templates_link"
     group = "shop_mailtemplates_group"
@@ -587,16 +563,16 @@ def __init__(self, context, request):
         # set title by context interface
         if IPloneSiteRoot.providedBy(context):
             self.title = _(
-                "mailtemplates_global", default=u"Notification Templates (global)"
+                "mailtemplates_global", default="Notification Templates (global)"
             )
         elif ISite.providedBy(context):
             self.title = _(
-                "mailtemplates_site", default=u"Notification Templates (site-wide)"
+                "mailtemplates_site", default="Notification Templates (site-wide)"
             )
         elif IVendor.providedBy(context):
             self.title = _(
                 "mailtemplates_vendor",
-                default=u"Notification Templates (vendor specific)",
+                default="Notification Templates (vendor specific)",
             )
         # set target URL
         self.url = "{}/@@mailtemplates".format(context.absolute_url())
@@ -609,18 +585,17 @@ def __init__(self, context, request):
 
 class DiscountGroup(ShopNavigationGroup):
     id = "shop_discount_group"
-    title = _("discount", default=u"Discount")
+    title = _("discount", default="Discount")
     order = 60
 
 
 class CartDiscountLink(ShopNavigationLink):
-    """Link for navigating to ``Cart Discount`` view.
-    """
+    """Link for navigating to ``Cart Discount`` view."""
 
     id = "shop_cart_discount_link"
     group = "shop_discount_group"
     permission = MANAGE_DISCOUNT
-    title = _("cart_discount", default=u"Cart Discount")
+    title = _("cart_discount", default="Cart Discount")
     order = 60
     cssclass = "cart_discount"
 
@@ -634,13 +609,12 @@ def __init__(self, context, request):
 
 
 class CartItemDiscountLink(ShopNavigationLink):
-    """Link for navigating to ``Item Discount`` view.
-    """
+    """Link for navigating to ``Item Discount`` view."""
 
     id = "shop_item_discount_link"
     group = "shop_discount_group"
     permission = MANAGE_DISCOUNT
-    title = _("item_discount", default=u"Item Discount")
+    title = _("item_discount", default="Item Discount")
     order = 61
     cssclass = "item_discount"
 
@@ -661,12 +635,11 @@ def __init__(self, context, request):
 
 
 class CartItemDiscountInContainerLink(CartItemDiscountLink):
-    """Link for navigating to ``Item Discount in Container`` view.
-    """
+    """Link for navigating to ``Item Discount in Container`` view."""
 
     id = "shop_item_discount_in_container_link"
     group = "shop_discount_group"
-    title = _("item_discount_in_container", default=u"Item Discount in Container")
+    title = _("item_discount_in_container", default="Item Discount in Container")
     order = 62
 
     def __init__(self, context, request):
@@ -692,13 +665,12 @@ def __init__(self, context, request):
 
 class AdministrationGroup(ShopNavigationGroup):
     id = "shop_administration_group"
-    title = _("administration", default=u"Administration")
+    title = _("administration", default="Administration")
     order = 70
 
 
 class ControlPanelLink(ShopNavigationLink):
-    """Link for navigating to ``Shop Control Panel`` view.
-    """
+    """Link for navigating to ``Shop Control Panel`` view."""
 
     id = "shop_control_panel_link"
     group = "shop_administration_group"
@@ -714,11 +686,11 @@ def __init__(self, context, request):
         # set title by context interface
         if IPloneSiteRoot.providedBy(context):
             self.title = _(
-                "shop_controlpanel_global", default=u"Shop Controlpanel (global)"
+                "shop_controlpanel_global", default="Shop Controlpanel (global)"
             )
         elif ISite.providedBy(context):
             self.title = _(
-                "shop_controlpanel_site", default=u"Shop Controlpanel (site-wide)"
+                "shop_controlpanel_site", default="Shop Controlpanel (site-wide)"
             )
         # set target URL
         self.url = "{}/@@shop_controlpanel".format(context.absolute_url())
diff --git a/src/bda/plone/shop/browser/toolbar.py b/src/bda/plone/shop/browser/toolbar.py
index ac24cc53..e84a4ef5 100644
--- a/src/bda/plone/shop/browser/toolbar.py
+++ b/src/bda/plone/shop/browser/toolbar.py
@@ -10,7 +10,7 @@
 
 @implementer(IActionsSubMenuItem)
 class ShopSubMenuItem(BrowserSubMenuItem):
-    title = _("shop", default=u"Shop")
+    title = _("shop", default="Shop")
     submenuId = "shop_toolbar_menu"
     extra = {"id": "shop_toolbar_menu", "li_class": "plonetoolbar-shop_toolbar_menu"}
     order = 70
diff --git a/src/bda/plone/shop/cartdata.py b/src/bda/plone/shop/cartdata.py
index 36f370b9..0d643d7e 100644
--- a/src/bda/plone/shop/cartdata.py
+++ b/src/bda/plone/shop/cartdata.py
@@ -28,8 +28,7 @@
 
 
 class CartItemCalculator(object):
-    """Object for calculating cart item related data.
-    """
+    """Object for calculating cart item related data."""
 
     def __init__(self, context):
         msg = (
@@ -45,8 +44,7 @@ def catalog(self):
         return api.portal.get_tool("portal_catalog")
 
     def item_net(self, item):
-        """Net price of item.
-        """
+        """Net price of item."""
         uid, count, _ = item
         try:
             obj = api.content.get(UID=uid)
@@ -58,8 +56,7 @@ def item_net(self, item):
         return item_net * count
 
     def item_vat(self, item):
-        """VAT of item.
-        """
+        """VAT of item."""
         uid, count, _ = item
         try:
             obj = api.content.get(UID=uid)
@@ -71,8 +68,7 @@ def item_vat(self, item):
         return (item_net / Decimal(100)) * Decimal(str(data.vat)) * count
 
     def item_weight(self, item):
-        """Weight of item.
-        """
+        """Weight of item."""
         uid, count, _ = item
         try:
             obj = api.content.get(UID=uid)
@@ -85,8 +81,7 @@ def item_weight(self, item):
         return Decimal(0)
 
     def net(self, items):
-        """Overall net of items.
-        """
+        """Overall net of items."""
         net = Decimal(0)
         for uid, count, unused in items:
             try:
@@ -102,8 +97,7 @@ def net(self, items):
         return net
 
     def vat(self, items):
-        """Overall VAT of items.
-        """
+        """Overall VAT of items."""
         vat = Decimal(0)
         for uid, count, unused in items:
             try:
@@ -119,8 +113,7 @@ def vat(self, items):
         return vat
 
     def weight(self, items):
-        """Overall weight of items.
-        """
+        """Overall weight of items."""
         weight = Decimal(0)
         for uid, count, unused in items:
             try:
@@ -174,15 +167,12 @@ def shipping_method(self):
 
     @property
     def checkout_url(self):
-        view_name = '@@checkout'
+        view_name = "@@checkout"
         # case anonymous user is permitted to perform checkout and intermediate
         # view is defined. can be used to ask user to login before checkout
         if api.user.is_anonymous() and CHECKOUT_INTERMEDIATE_VIEW:
             view_name = CHECKOUT_INTERMEDIATE_VIEW
-        return "{0}/{1}".format(
-            self.context.absolute_url(),
-            view_name
-        )
+        return "{0}/{1}".format(self.context.absolute_url(), view_name)
 
     @property
     def cart_url(self):
@@ -205,8 +195,8 @@ def validate_set(self, uid):
             buyable = api.content.get(UID=uid)
         except ValueError:
             message = _(
-                u"buyable_does_not_exist",
-                default=u"Buyable item with UID {uuid} does not exist.",
+                "buyable_does_not_exist",
+                default="Buyable item with UID {uuid} does not exist.",
                 mapping={"uuid": uid},
             )
             return {"success": False, "error": message, "update": True}
@@ -214,8 +204,8 @@ def validate_set(self, uid):
         if not api.user.has_permission(permissions.ModifyCart, obj=buyable):
             remove_item_from_cart(self.request, uid)
             message = _(
-                u"permission_not_granted_to_buy_item",
-                default=u"Permission to buy ${title} not granted.",
+                "permission_not_granted_to_buy_item",
+                default="Permission to buy ${title} not granted.",
                 mapping={"title": buyable.Title()},
             )
             message = translate(message, context=self.request)
@@ -228,14 +218,14 @@ def validate_set(self, uid):
             effective = buyable_period.effective
             if effective and now < effective:
                 remove_item_from_cart(self.request, uid)
-                message = _("item_not_buyable_yet", default=u"Item not buyable yet")
+                message = _("item_not_buyable_yet", default="Item not buyable yet")
                 message = translate(message, context=self.request)
                 return {"success": False, "error": message, "update": True}
             # expires date exceed
             expires = buyable_period.expires
             if expires and now > expires:
                 remove_item_from_cart(self.request, uid)
-                message = _("item_no_longer_buyable", default=u"Item no longer buyable")
+                message = _("item_no_longer_buyable", default="Item no longer buyable")
                 message = translate(message, context=self.request)
                 return {"success": False, "error": message, "update": True}
         return {"success": True, "error": ""}
@@ -305,28 +295,28 @@ class CartItemState(CartItemStateBase):
     @property
     def completely_exceeded_alert(self):
         message = _(
-            u"alert_item_no_longer_available",
-            default=u"No longer available, please " u"remove from cart",
+            "alert_item_no_longer_available",
+            default="No longer available, please " "remove from cart",
         )
         return translate(message, context=self.request)
 
     @property
     def some_reservations_alert(self):
-        message = _(u"alert_item_some_reserved", default=u"Partly reserved")
+        message = _("alert_item_some_reserved", default="Partly reserved")
         return translate(message, context=self.request)
 
     def partly_exceeded_alert(self, exceed, quantity_unit):
         message = _(
-            u"alert_item_number_exceed",
-            default=u"Limit exceed by ${exceed} ${quantity_unit}",
+            "alert_item_number_exceed",
+            default="Limit exceed by ${exceed} ${quantity_unit}",
             mapping={"exceed": exceed, "quantity_unit": quantity_unit},
         )
         return translate(message, context=self.request)
 
     def number_reservations_alert(self, reserved, quantity_unit):
         message = _(
-            u"alert_item_number_reserved",
-            default=u"${reserved} ${quantity_unit} reserved",
+            "alert_item_number_reserved",
+            default="${reserved} ${quantity_unit} reserved",
             mapping={"reserved": reserved, "quantity_unit": quantity_unit},
         )
         return translate(message, context=self.request)
diff --git a/src/bda/plone/shop/dx.py b/src/bda/plone/shop/dx.py
index d67ce15a..087b737e 100644
--- a/src/bda/plone/shop/dx.py
+++ b/src/bda/plone/shop/dx.py
@@ -25,6 +25,7 @@
 from zope.schema.interfaces import IContextAwareDefaultFactory
 from zope.schema.interfaces import IVocabularyFactory
 
+
 @provider(IContextAwareDefaultFactory)
 def default_item_net(context):
     default = get_shop_article_settings().default_item_net
@@ -32,6 +33,7 @@ def default_item_net(context):
         return Decimal(default)
     return default
 
+
 @provider(IContextAwareDefaultFactory)
 def default_item_vat(context):
     return get_shop_tax_settings().default_item_vat
@@ -65,7 +67,6 @@ def default_item_cart_count_limit(context):
     return default
 
 
-
 @provider(IContextAwareDefaultFactory)
 def default_item_quantity_unit(context):
     return get_shop_article_settings().default_item_quantity_unit
@@ -73,12 +74,11 @@ def default_item_quantity_unit(context):
 
 @provider(IFormFieldProvider)
 class IBuyableBehavior(model.Schema, IBuyable):
-    """Buyable behavior.
-    """
+    """Buyable behavior."""
 
     model.fieldset(
         "shop",
-        label=u"Shop",
+        label="Shop",
         fields=[
             "item_net",
             "item_vat",
@@ -92,14 +92,14 @@ class IBuyableBehavior(model.Schema, IBuyable):
     )
 
     item_net = schema.Decimal(
-        title=_(u"label_item_net", default=u"Item net price"),
+        title=_("label_item_net", default="Item net price"),
         required=False,
         defaultFactory=default_item_net,
         min=Decimal(0),
     )
 
     item_vat = schema.Choice(
-        title=_(u"label_item_vat", default=u"Item VAT (in %)"),
+        title=_("label_item_vat", default="Item VAT (in %)"),
         vocabulary="bda.plone.shop.vocabularies.VatVocabulary",
         required=False,
         defaultFactory=default_item_vat,
@@ -107,7 +107,7 @@ class IBuyableBehavior(model.Schema, IBuyable):
 
     item_cart_count_limit = schema.Decimal(
         title=_(
-            u"label_item_cart_count_limit", default=u"Max count of this item in cart"
+            "label_item_cart_count_limit", default="Max count of this item in cart"
         ),
         required=False,
         defaultFactory=default_item_cart_count_limit,
@@ -115,34 +115,34 @@ class IBuyableBehavior(model.Schema, IBuyable):
     )
 
     item_display_gross = schema.Bool(
-        title=_(u"label_item_display_gross", default=u"Display Gross Price"),
+        title=_("label_item_display_gross", default="Display Gross Price"),
         description=_(
-            u"help_item_display_gross", default=u"Show price with taxes included"
+            "help_item_display_gross", default="Show price with taxes included"
         ),
         required=False,
         defaultFactory=default_item_display_gross,
     )
 
     item_comment_enabled = schema.Bool(
-        title=_(u"label_item_comment_enabled", default="Comment enabled"),
+        title=_("label_item_comment_enabled", default="Comment enabled"),
         required=False,
         defaultFactory=item_comment_enabled,
     )
 
     item_comment_required = schema.Bool(
-        title=_(u"label_item_comment_required", default="Comment required"),
+        title=_("label_item_comment_required", default="Comment required"),
         required=False,
         defaultFactory=default_item_comment_required,
     )
 
     item_quantity_unit_float = schema.Bool(
-        title=_(u"label_item_quantity_unit_float", default="Quantity as float"),
+        title=_("label_item_quantity_unit_float", default="Quantity as float"),
         required=False,
         defaultFactory=default_item_quantity_unit_float,
     )
 
     item_quantity_unit = schema.Choice(
-        title=_(u"label_item_quantity_unit", default="Quantity unit"),
+        title=_("label_item_quantity_unit", default="Quantity unit"),
         vocabulary="bda.plone.shop.vocabularies.QuantityUnitVocabulary",
         required=False,
         defaultFactory=default_item_quantity_unit,
@@ -151,8 +151,7 @@ class IBuyableBehavior(model.Schema, IBuyable):
 
 @adapter(IBuyableBehavior)
 class DXCartItemDataProvider(CartItemDataProviderBase):
-    """Accessor Interface
-    """
+    """Accessor Interface"""
 
     @property
     def net(self):
@@ -211,12 +210,11 @@ def default_item_stock_warning_threshold(context):
 
 @provider(IFormFieldProvider)
 class IStockBehavior(model.Schema):
-    """Stock behavior.
-    """
+    """Stock behavior."""
 
     model.fieldset(
         "shop",
-        label=u"Shop",
+        label="Shop",
         fields=[
             "item_display_stock",
             "item_available",
@@ -226,25 +224,24 @@ class IStockBehavior(model.Schema):
     )
 
     item_display_stock = schema.Bool(
-        title=_(u"label_item_display_stock", default=u"Display item stock"),
+        title=_("label_item_display_stock", default="Display item stock"),
         required=False,
         defaultFactory=default_item_display_stock,
     )
 
     item_available = schema.Float(
-        title=_(u"label_item_available", default=u"Item stock available"),
+        title=_("label_item_available", default="Item stock available"),
         required=False,
     )
 
     item_overbook = schema.Float(
-        title=_(u"label_item_overbook", default=u"Item stock overbook"), 
-        required=False
+        title=_("label_item_overbook", default="Item stock overbook"), required=False
     )
 
     item_stock_warning_threshold = schema.Float(
         title=_(
-            u"label_item_stock_warning_threshold",
-            default=u"Item stock warning threshold.",
+            "label_item_stock_warning_threshold",
+            default="Item stock warning threshold.",
         ),
         required=False,
         defaultFactory=default_item_stock_warning_threshold,
@@ -254,8 +251,7 @@ class IStockBehavior(model.Schema):
 @implementer(ICartItemStock)
 @adapter(IStockBehavior)
 class DXCartItemStock(object):
-    """Accessor Interface
-    """
+    """Accessor Interface"""
 
     def __init__(self, context):
         self.context = context
@@ -296,12 +292,11 @@ def default_shipping_item_shippable(context):
 
 @provider(IFormFieldProvider)
 class IShippingBehavior(model.Schema):
-    """Shipping behavior.
-    """
+    """Shipping behavior."""
 
     model.fieldset(
         "shop",
-        label=u"Shop",
+        label="Shop",
         fields=[
             "shipping_item_shippable",
             "shipping_item_weight",
@@ -310,35 +305,33 @@ class IShippingBehavior(model.Schema):
     )
 
     shipping_item_shippable = schema.Bool(
-        title=_(u"label_shipping_item_shippable", default=u"Item Shippable"),
+        title=_("label_shipping_item_shippable", default="Item Shippable"),
         description=_(
             "help_shipping_item_shippable",
-            default=u"Flag whether item is shippable, i.e. " u"downloads are not",
+            default="Flag whether item is shippable, i.e. " "downloads are not",
         ),
         defaultFactory=default_shipping_item_shippable,
-        required=False
+        required=False,
     )
 
     shipping_item_weight = schema.Float(
-        title=_(u"label_shipping_item_weight", default=u"Item Weight"), 
-        required=False
+        title=_("label_shipping_item_weight", default="Item Weight"), required=False
     )
 
     shipping_item_free_shipping = schema.Bool(
-        title=_(u"label_shipping_item_free_shipping", default=u"Free Shipping"),
+        title=_("label_shipping_item_free_shipping", default="Free Shipping"),
         description=_(
             "help_shipping_item_free_shipping",
-            default=u"Flag whether shipping of this item is free.",
+            default="Flag whether shipping of this item is free.",
         ),
-        required=False
+        required=False,
     )
 
 
 @implementer(IShippingItem)
 @adapter(IShippingBehavior)
 class DXShippingItem(object):
-    """Accessor Interface
-    """
+    """Accessor Interface"""
 
     def __init__(self, context):
         self.context = context
@@ -358,8 +351,7 @@ def free_shipping(self):
 
 @adapter(IDexterityContent)
 class DXCartItemPreviewImage(CartItemPreviewAdapterBase):
-    """Accessor Interface
-    """
+    """Accessor Interface"""
 
     preview_scale = "thumb"
 
@@ -378,22 +370,21 @@ def url(self):
 @provider(IFormFieldProvider)
 class IItemNotificationTextBehavior(model.Schema):
 
-    model.fieldset("shop", label=u"Shop", fields=["order_text", "overbook_text"])
+    model.fieldset("shop", label="Shop", fields=["order_text", "overbook_text"])
 
     order_text = schema.Text(
         title=_(
-            u"label_item_notification_text",
-            default=u"Notification text for this item in the order "
-            u"confirmation mail",
+            "label_item_notification_text",
+            default="Notification text for this item in the order " "confirmation mail",
         ),
         required=False,
     )
 
     overbook_text = schema.Text(
         title=_(
-            u"label_item_overbook_notification_text",
-            default=u"Notification text for this item in the order "
-            u"confirmation mail if item is out of stock",
+            "label_item_overbook_notification_text",
+            default="Notification text for this item in the order "
+            "confirmation mail if item is out of stock",
         ),
         required=False,
     )
@@ -403,23 +394,23 @@ class IItemNotificationTextBehavior(model.Schema):
 class IGlobalNotificationTextBehavior(model.Schema):
 
     model.fieldset(
-        "shop", label=u"Shop", fields=["global_order_text", "global_overbook_text"]
+        "shop", label="Shop", fields=["global_order_text", "global_overbook_text"]
     )
 
     global_order_text = schema.Text(
         title=_(
-            u"label_item_global_notification_text",
-            default=u"Additional overall notification text for the order "
-            u"confirmation mail of this item",
+            "label_item_global_notification_text",
+            default="Additional overall notification text for the order "
+            "confirmation mail of this item",
         ),
         required=False,
     )
 
     global_overbook_text = schema.Text(
         title=_(
-            u"label_item_global_overbook_notification_text",
-            default=u"Additional overall notification text for the order "
-            u"confirmation mail of this item ordered if out of stock",
+            "label_item_global_overbook_notification_text",
+            default="Additional overall notification text for the order "
+            "confirmation mail of this item ordered if out of stock",
         ),
         required=False,
     )
@@ -427,8 +418,7 @@ class IGlobalNotificationTextBehavior(model.Schema):
 
 @adapter(IItemNotificationTextBehavior)
 class DXItemNotificationText(BubbleItemNotificationText):
-    """Accessor Interface
-    """
+    """Accessor Interface"""
 
     @property
     def order_text(self):
@@ -445,8 +435,7 @@ def overbook_text(self):
 
 @adapter(IGlobalNotificationTextBehavior)
 class DXGlobalNotificationText(BubbleGlobalNotificationText):
-    """Accessor Interface
-    """
+    """Accessor Interface"""
 
     @property
     def global_order_text(self):
@@ -463,20 +452,19 @@ def global_overbook_text(self):
 
 @provider(IFormFieldProvider)
 class IBuyablePeriodBehavior(model.Schema):
-    """Buyable period behavior.
-    """
+    """Buyable period behavior."""
 
     model.fieldset(
-        "shop", label=u"Shop", fields=["buyable_effective", "buyable_expires"]
+        "shop", label="Shop", fields=["buyable_effective", "buyable_expires"]
     )
 
     buyable_effective = schema.Datetime(
-        title=_(u"label_buyable_effective_date", default=u"Buyable effective date"),
+        title=_("label_buyable_effective_date", default="Buyable effective date"),
         required=False,
     )
 
     buyable_expires = schema.Datetime(
-        title=_(u"label_buyable_expiration_date", default=u"Buyable expiration date"),
+        title=_("label_buyable_expiration_date", default="Buyable expiration date"),
         required=False,
     )
 
@@ -498,20 +486,19 @@ def expires(self):
 
 @provider(IFormFieldProvider)
 class ITradingBehavior(model.Schema):
-    """Trading behavior.
-    """
+    """Trading behavior."""
 
-    model.fieldset("shop", label=u"Shop", fields=["item_number", "gtin"])
+    model.fieldset("shop", label="Shop", fields=["item_number", "gtin"])
 
     item_number = schema.TextLine(
-        title=_(u"label_item_number", default=u"Item number"),
-        description=_(u"help_item_number", default=u"Buyable Item number"),
+        title=_("label_item_number", default="Item number"),
+        description=_("help_item_number", default="Buyable Item number"),
         required=False,
     )
 
     gtin = schema.TextLine(
-        title=_(u"label_gtin", default=u"GTIN"),
-        description=_(u"help_gtin", default=u"Global Trade Item Number"),
+        title=_("label_gtin", default="GTIN"),
+        description=_("help_gtin", default="Global Trade Item Number"),
         required=False,
     )
 
diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 41054c49..335f4266 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -24,8 +24,7 @@
 
 
 class IShopExtensionLayer(IOrdersExtensionLayer):
-    """Browser layer for bda.plone.shop
-    """
+    """Browser layer for bda.plone.shop"""
 
 
 class IPotentiallyBuyable(Interface):
@@ -36,12 +35,11 @@ class IPotentiallyBuyable(Interface):
 
 
 class IBuyablePeriod(Interface):
-    """Define period in which an item is buyable.
-    """
+    """Define period in which an item is buyable."""
 
-    effective = Attribute(u"Buyable effective date")
+    effective = Attribute("Buyable effective date")
 
-    expires = Attribute(u"Buyable expires date")
+    expires = Attribute("Buyable expires date")
 
 
 class IShopSettingsProvider(Interface):
@@ -51,28 +49,27 @@ class IShopSettingsProvider(Interface):
 
 
 class IShopSettings(model.Schema):
-    """Shop controlpanel schema.
-    """
+    """Shop controlpanel schema."""
 
     admin_email = schema.ASCIILine(
-        title=_(u"label_admin_email", default=u"Shop Admin E-Mail"),
-        description=_(u"help_admin_email", default=u"No typos please...."),
+        title=_("label_admin_email", default="Shop Admin E-Mail"),
+        description=_("help_admin_email", default="No typos please...."),
         required=True,
         default="",
     )
 
     # XXX: change value type to schema.TextLine (needs migration)
     admin_name = schema.ASCIILine(
-        title=_(u"label_admin_name", default=u"Shop Admin Name"),
-        description=_(u"help_admin_name", default=u"Name used for Shop E-Mails."),
+        title=_("label_admin_name", default="Shop Admin Name"),
+        description=_("help_admin_name", default="Name used for Shop E-Mails."),
         required=True,
         default="",
     )
 
     add_customer_role_to_new_users = schema.Bool(
         title=_(
-            u"label_add_customer_role_to_new_users",
-            default=u"Add Customer role to new Users",
+            "label_add_customer_role_to_new_users",
+            default="Add Customer role to new Users",
         ),
         required=False,
         default=True,
@@ -80,33 +77,30 @@ class IShopSettings(model.Schema):
 
     # XXX: this is an article setting, move to IShopArticleSettings
     default_item_display_gross = schema.Bool(
-        title=_(
-            u"label_default_item_display_gross", default=u"Display Gross by default"
-        ),
+        title=_("label_default_item_display_gross", default="Display Gross by default"),
         required=False,
     )
 
     currency = schema.Choice(
-        title=_(u"label_currency", default="Currency"),
-        description=_(u"help_currency", default=u"Choose the default currency"),
+        title=_("label_currency", default="Currency"),
+        description=_("help_currency", default="Choose the default currency"),
         vocabulary="bda.plone.shop.vocabularies.AvailableCurrenciesVocabulary",
     )
 
     show_currency = schema.Choice(
-        title=_(u"label_show_currency", default=u"Show the currency for items"),
-        description=_(u"help_show_currency", default=u""),
+        title=_("label_show_currency", default="Show the currency for items"),
+        description=_("help_show_currency", default=""),
         vocabulary="bda.plone.shop.vocabularies." "CurrencyDisplayOptionsVocabulary",
     )
 
 
 @provider(IShopSettingsProvider)
 class IShopCartSettings(model.Schema):
-    """Shop controlpanel schema for cart settings.
-    """
+    """Shop controlpanel schema for cart settings."""
 
     model.fieldset(
         "cart",
-        label=_(u"Cart", default=u"Cart"),
+        label=_("Cart", default="Cart"),
         fields=[
             "hide_cart_if_empty",
             "max_artice_count",
@@ -118,53 +112,53 @@ class IShopCartSettings(model.Schema):
     )
 
     hide_cart_if_empty = schema.Bool(
-        title=_(u"label_hide_cart_if_empty", default=u"Hide Cart if empty"),
+        title=_("label_hide_cart_if_empty", default="Hide Cart if empty"),
         description=_(
-            u"help_hide_cart_if_empty", default=u"Hide cart if no items contained"
+            "help_hide_cart_if_empty", default="Hide cart if no items contained"
         ),
         default=False,
         required=False,
     )
 
     max_artice_count = schema.Int(
-        title=_(u"label_max_artice_count", default=u"Maximum number articles in cart"),
+        title=_("label_max_artice_count", default="Maximum number articles in cart"),
         description=_(
-            u"help_max_artice_count",
-            default=u"Maximum number of articles in cart if disable max "
-            u"article flag set",
+            "help_max_artice_count",
+            default="Maximum number of articles in cart if disable max "
+            "article flag set",
         ),
         required=False,
     )
 
     disable_max_article = schema.Bool(
-        title=_(u"label_disable_max_article", default=u"Disable max article"),
+        title=_("label_disable_max_article", default="Disable max article"),
         description=_(
-            u"help_disable_max_article",
-            default=u"No total number of items in cart limit",
+            "help_disable_max_article",
+            default="No total number of items in cart limit",
         ),
         default=True,
         required=False,
     )
 
     summary_total_only = schema.Bool(
-        title=_(u"label_summary_total_only", default=u"Cart Summary total only"),
+        title=_("label_summary_total_only", default="Cart Summary total only"),
         description=_(
-            u"help_summary_total_only", default=u"Show only total value in cart summary"
+            "help_summary_total_only", default="Show only total value in cart summary"
         ),
         default=False,
         required=False,
     )
 
     show_checkout = schema.Bool(
-        title=_(u"label_show_checkout", default=u"Show checkout link in portlet"),
-        description=_(u"help_show_checkout", default=""),
+        title=_("label_show_checkout", default="Show checkout link in portlet"),
+        description=_("help_show_checkout", default=""),
         default=False,
         required=False,
     )
 
     show_to_cart = schema.Bool(
-        title=_(u"label_show_to_cart", default=u"Show link to cart in portlet"),
-        description=_(u"help_show_to_cart", default=u""),
+        title=_("label_show_to_cart", default="Show link to cart in portlet"),
+        description=_("help_show_to_cart", default=""),
         default=True,
         required=False,
     )
@@ -172,12 +166,11 @@ class IShopCartSettings(model.Schema):
 
 @provider(IShopSettingsProvider)
 class IShopArticleSettings(model.Schema):
-    """Shop controlpanel schema for article settings.
-    """
+    """Shop controlpanel schema for article settings."""
 
     model.fieldset(
         "article",
-        label=_(u"Article", default=u"Article"),
+        label=_("Article", default="Article"),
         fields=[
             "quantity_units",
             "default_item_net",
@@ -193,14 +186,14 @@ class IShopArticleSettings(model.Schema):
     widget("quantity_units", CheckBoxFieldWidget)
     quantity_units = schema.List(
         title=_(
-            u"label_quantity_units", default=u"Specify quantity units allowed in shop."
+            "label_quantity_units", default="Specify quantity units allowed in shop."
         ),
         description=_(
-            u"help_quantity_units",
-            default=u"Quantity units (what the buyable items are measured in)",
+            "help_quantity_units",
+            default="Quantity units (what the buyable items are measured in)",
         ),
         required=False,
-        missing_value=set(['quantity']),
+        missing_value=set(["quantity"]),
         value_type=schema.Choice(
             vocabulary="bda.plone.shop.vocabularies." "AvailableQuantityUnitVocabulary"
         ),
@@ -208,27 +201,27 @@ class IShopArticleSettings(model.Schema):
 
     default_item_quantity_unit = schema.Choice(
         title=_(
-            u"label_default_quantity_units", default=u"Specify default quantity name."
+            "label_default_quantity_units", default="Specify default quantity name."
         ),
-        description=_(u"help_default_quantity_unit", default=u"default measurement"),
+        description=_("help_default_quantity_unit", default="default measurement"),
         vocabulary="bda.plone.shop.vocabularies.QuantityUnitVocabulary",
     )
 
     default_item_net = schema.Decimal(
-        title=_(u"label_default_item_net", default=u"Default Item net price"),
+        title=_("label_default_item_net", default="Default Item net price"),
         required=False,
     )
 
     default_item_comment_enabled = schema.Bool(
         title=_(
-            u"label_default_item_comment_enabled", default="Comment enabled by default"
+            "label_default_item_comment_enabled", default="Comment enabled by default"
         ),
         required=False,
     )
 
     default_item_comment_required = schema.Bool(
         title=_(
-            u"label_default_item_comment_required",
+            "label_default_item_comment_required",
             default="Comment required by default",
         ),
         required=False,
@@ -236,7 +229,7 @@ class IShopArticleSettings(model.Schema):
 
     default_item_quantity_unit_float = schema.Bool(
         title=_(
-            u"label_default_item_quantity_unit_float",
+            "label_default_item_quantity_unit_float",
             default="Quantity as float as default",
         ),
         required=False,
@@ -244,7 +237,7 @@ class IShopArticleSettings(model.Schema):
 
     default_item_cart_count_limit = schema.Decimal(
         title=_(
-            u"label_default_item_cart_count_limit",
+            "label_default_item_cart_count_limit",
             default="Quantity limit of an item in the cart.",
         ),
         required=False,
@@ -252,13 +245,13 @@ class IShopArticleSettings(model.Schema):
 
     default_item_stock_warning_threshold = schema.Decimal(
         title=_(
-            u"label_default_item_stock_warning_threshold",
+            "label_default_item_stock_warning_threshold",
             default="Item stock warning threshold.",
         ),
         description=_(
             "help_default_item_stock_warning_threshold",
-            default=u"Shop administrator will be notified if stock is less "
-            u"than the specified threshold.",
+            default="Shop administrator will be notified if stock is less "
+            "than the specified threshold.",
         ),
         required=False,
     )
@@ -266,12 +259,11 @@ class IShopArticleSettings(model.Schema):
 
 @provider(IShopSettingsProvider)
 class IShopShippingSettings(model.Schema):
-    """Shop controlpanel schema for article settings.
-    """
+    """Shop controlpanel schema for article settings."""
 
     model.fieldset(
         "shipping",
-        label=_(u"Shipping", default=u"Shipping"),
+        label=_("Shipping", default="Shipping"),
         fields=[
             "default_shipping_item_shippable",
             "available_shipping_methods",
@@ -286,24 +278,24 @@ class IShopShippingSettings(model.Schema):
 
     default_shipping_item_shippable = schema.Bool(
         title=_(
-            u"label_default_shipping_item_shippable",
-            default=u"Item Shippable by default",
+            "label_default_shipping_item_shippable",
+            default="Item Shippable by default",
         ),
         description=_(
             "help_default_shipping_item_shippable",
-            default=u"Flag whether item is shippable by default, "
-            u"i.e. downloads are not",
+            default="Flag whether item is shippable by default, "
+            "i.e. downloads are not",
         ),
         required=False,
     )
 
     available_shipping_methods = schema.List(
         title=_(
-            u"label_available_shipping_methods", default=u"Available Shipping Methods"
+            "label_available_shipping_methods", default="Available Shipping Methods"
         ),
         description=_(
-            u"help_available_shipping_methods",
-            default=u"Available shipping methods in checkout",
+            "help_available_shipping_methods",
+            default="Available shipping methods in checkout",
         ),
         required=True,
         min_length=1,
@@ -314,17 +306,17 @@ class IShopShippingSettings(model.Schema):
     )
 
     shipping_method = schema.Choice(
-        title=_(u"label_shipping_method", default=u"Shipping Method"),
+        title=_("label_shipping_method", default="Shipping Method"),
         description=_(
-            u"help_shipping_method", default=u"Default shipping method in checkout"
+            "help_shipping_method", default="Default shipping method in checkout"
         ),
         vocabulary="bda.plone.shop.vocabularies." "ShippingMethodsVocabulary",
     )
 
     shipping_vat = schema.Choice(
-        title=_(u"label_shipping_vat", default=u"Shipping VAT"),
+        title=_("label_shipping_vat", default="Shipping VAT"),
         description=_(
-            u"help_shipping_vat", default=u"VAT used to calculate shipping costs"
+            "help_shipping_vat", default="VAT used to calculate shipping costs"
         ),
         vocabulary="bda.plone.shop.vocabularies.VatVocabulary",
     )
@@ -332,64 +324,63 @@ class IShopShippingSettings(model.Schema):
     # default shipping related settings
 
     free_shipping_limit = schema.Decimal(
-        title=_(u"label_free_shipping_limit", default=u"Free Shipping Limit"),
+        title=_("label_free_shipping_limit", default="Free Shipping Limit"),
         description=_(
-            u"help_free_shipping_limit",
-            default=u"Do not add shipping costs to orders "
-            u"with price bigger than limit. If limit "
-            u"applies to gross or net purchase price "
-            u"depends on 'Calculate shipping limit from "
-            u"gross' setting",
+            "help_free_shipping_limit",
+            default="Do not add shipping costs to orders "
+            "with price bigger than limit. If limit "
+            "applies to gross or net purchase price "
+            "depends on 'Calculate shipping limit from "
+            "gross' setting",
         ),
         required=True,
-        default=Decimal('200.0'),
+        default=Decimal("200.0"),
     )
 
     shipping_limit_from_gross = schema.Bool(
         title=_(
-            u"label_shipping_limit_from_gross",
-            default=u"Calculate shipping limit from gross",
+            "label_shipping_limit_from_gross",
+            default="Calculate shipping limit from gross",
         ),
         description=_(
-            u"help_shipping_limit_from_gross",
-            default=u"If set to False, shipping limit gets "
-            u"calculated from net price instead of gross.",
+            "help_shipping_limit_from_gross",
+            default="If set to False, shipping limit gets "
+            "calculated from net price instead of gross.",
         ),
         required=False,
     )
 
     flat_shipping_cost = schema.Decimal(
-        title=_(u"label_flat_shipping_cost", default=u"Flat shipping cost"),
-        description=_(u"help_flat_shipping_cost", default=u"Net flat shipping cost"),
+        title=_("label_flat_shipping_cost", default="Flat shipping cost"),
+        description=_("help_flat_shipping_cost", default="Net flat shipping cost"),
         required=True,
-        default=Decimal('10.0'),
+        default=Decimal("10.0"),
     )
 
     item_shipping_cost = schema.Decimal(
-        title=_(u"label_item_shipping_cost", default=u"Item shipping cost"),
+        title=_("label_item_shipping_cost", default="Item shipping cost"),
         description=_(
-            u"help_item_shipping_cost",
-            default=u"Net shipping cost per item in cart. If flat "
-            u"shipping cost set and item shipping cost "
-            u"below flat shipping cost, flat shipping cost "
-            u"is used",
+            "help_item_shipping_cost",
+            default="Net shipping cost per item in cart. If flat "
+            "shipping cost set and item shipping cost "
+            "below flat shipping cost, flat shipping cost "
+            "is used",
         ),
         required=True,
-        default=Decimal('0.0'),
+        default=Decimal("0.0"),
     )
 
 
 @provider(IShopSettingsProvider)
 class IShopTaxSettings(model.Schema):
-    """Shop controlpanel schema for tax settings.
-    """
+    """Shop controlpanel schema for tax settings."""
 
-    model.fieldset("tax", label=_(u"Tax Settings"), fields=["vat", "default_item_vat"])
+    model.fieldset("tax", label=_("Tax Settings"), fields=["vat", "default_item_vat"])
 
     widget("vat", CheckBoxFieldWidget)
     vat = schema.List(
-        title=_(u"label_vat", default=u"VAT in %"),
-        description=_(u"help_vat", default=u"Specify all allowed vat settings"),
+        title=_("label_vat", default="VAT in %"),
+        description=_("help_vat", default="Specify all allowed vat settings"),
         required=False,
         missing_value=set([0]),
         value_type=schema.Choice(
@@ -398,8 +389,8 @@ class IShopTaxSettings(model.Schema):
     )
 
     default_item_vat = schema.Choice(
-        title=_(u"label_default_vat", default=u"Default Value added tax name"),
-        description=_(u"help_default_vat", default=u"Specify default vat name"),
+        title=_("label_default_vat", default="Default Value added tax name"),
+        description=_("help_default_vat", default="Specify default vat name"),
         vocabulary="bda.plone.shop.vocabularies.VatVocabulary",
     )
 
@@ -407,12 +398,12 @@ class IShopTaxSettings(model.Schema):
 class ILanguageAwareTextRow(model.Schema):
 
     lang = schema.Choice(
-        title=_(u"language", default=u"Language"),
+        title=_("language", default="Language"),
         vocabulary="plone.app.vocabularies.SupportedContentLanguages",
         required=False,
     )
 
-    text = schema.Text(title=_(u"text", default=u"Text"), required=False)
+    text = schema.Text(title=_("text", default="Text"), required=False)
 
 
 @provider(IShopSettingsProvider)
@@ -422,7 +413,7 @@ class INotificationTextSettings(
 
     model.fieldset(
         "notifications",
-        label=_(u"Notifications", default=u"Notifications"),
+        label=_("Notifications", default="Notifications"),
         fields=[
             "global_order_text",
             "global_overbook_text",
@@ -434,12 +425,11 @@ class INotificationTextSettings(
     widget("order_text", DataGridFieldFactory)
     order_text = schema.List(
         title=_(
-            u"label_site_item_notification_text",
-            default=u"Default notification text for items in order "
-            u"confirmation mail",
+            "label_site_item_notification_text",
+            default="Default notification text for items in order " "confirmation mail",
         ),
         value_type=DictRow(
-            title=_(u"order_text", default="Order Text"), schema=ILanguageAwareTextRow
+            title=_("order_text", default="Order Text"), schema=ILanguageAwareTextRow
         ),
         required=False,
     )
@@ -447,12 +437,12 @@ class INotificationTextSettings(
     widget("overbook_text", DataGridFieldFactory)
     overbook_text = schema.List(
         title=_(
-            u"label_site_item_overbook_notification_text",
-            default=u"Default notification text for items in order "
-            u"confirmation mail if item out of stock.",
+            "label_site_item_overbook_notification_text",
+            default="Default notification text for items in order "
+            "confirmation mail if item out of stock.",
         ),
         value_type=DictRow(
-            title=_(u"overbook_text", default="Overbook Text"),
+            title=_("overbook_text", default="Overbook Text"),
             schema=ILanguageAwareTextRow,
         ),
         required=False,
@@ -461,11 +451,11 @@ class INotificationTextSettings(
     widget("global_order_text", DataGridFieldFactory)
     global_order_text = schema.List(
         title=_(
-            u"label_site_global_notification_text",
-            default=u"Overall notification text for order confirmation mail",
+            "label_site_global_notification_text",
+            default="Overall notification text for order confirmation mail",
         ),
         value_type=DictRow(
-            title=_(u"order_text", default="Order Text"), schema=ILanguageAwareTextRow
+            title=_("order_text", default="Order Text"), schema=ILanguageAwareTextRow
         ),
         required=False,
     )
@@ -473,12 +463,12 @@ class INotificationTextSettings(
     widget("global_overbook_text", DataGridFieldFactory)
     global_overbook_text = schema.List(
         title=_(
-            u"label_site_global_overbook_notification_text",
-            default=u"Overall notification text for order confirmation mail "
-            u"if order contains items out of stock",
+            "label_site_global_overbook_notification_text",
+            default="Overall notification text for order confirmation mail "
+            "if order contains items out of stock",
         ),
         value_type=DictRow(
-            title=_(u"overbook_text", default="Overbook Text"),
+            title=_("overbook_text", default="Overbook Text"),
             schema=ILanguageAwareTextRow,
         ),
         required=False,
@@ -487,12 +477,11 @@ class INotificationTextSettings(
 
 @provider(IShopSettingsProvider)
 class IInvoiceSettings(model.Schema):
-    """Global invoice settings.
-    """
+    """Global invoice settings."""
 
     model.fieldset(
         "invoice",
-        label=_(u"Invoice", default=u"Invoice"),
+        label=_("Invoice", default="Invoice"),
         fields=[
             "default_invoice_company",
             "default_invoice_companyadd",
@@ -511,98 +500,94 @@ class IInvoiceSettings(model.Schema):
     )
 
     default_invoice_company = schema.TextLine(
-        title=_(u"label_company", default=u"Company"),
+        title=_("label_company", default="Company"),
         description=_(
-            u"help_invoice_company", default=u"Company name of invoice sender."
+            "help_invoice_company", default="Company name of invoice sender."
         ),
         required=False,
     )
 
     default_invoice_companyadd = schema.TextLine(
-        title=_(u"label_companyadd", default=u"Company additional"),
+        title=_("label_companyadd", default="Company additional"),
         description=_(
-            u"help_invoice_companyadd",
-            default=u"Optional additional line displayed under company name",
+            "help_invoice_companyadd",
+            default="Optional additional line displayed under company name",
         ),
         required=False,
     )
 
     default_invoice_firstname = schema.TextLine(
-        title=_(u"label_firstname", default=u"First name"),
-        description=_(
-            u"help_invoice_firstname", default=u"Given name of invoice sender"
-        ),
+        title=_("label_firstname", default="First name"),
+        description=_("help_invoice_firstname", default="Given name of invoice sender"),
         required=False,
     )
 
     default_invoice_lastname = schema.TextLine(
-        title=_(u"label_lastname", default=u"Last name"),
-        description=_(u"help_invoice_lastname", default=u"Last name of invoice sender"),
+        title=_("label_lastname", default="Last name"),
+        description=_("help_invoice_lastname", default="Last name of invoice sender"),
         required=False,
     )
 
     default_invoice_street = schema.TextLine(
-        title=_(u"label_street", default=u"Street"),
-        description=_(u"help_invoice_street", default=u"Street of invoice sender"),
+        title=_("label_street", default="Street"),
+        description=_("help_invoice_street", default="Street of invoice sender"),
         required=False,
     )
 
     default_invoice_zip = schema.TextLine(
-        title=_(u"label_zip", default=u"Postal Code"),
-        description=_(u"help_invoice_zip", default=u"Postal code of invoice sender"),
+        title=_("label_zip", default="Postal Code"),
+        description=_("help_invoice_zip", default="Postal code of invoice sender"),
         required=False,
     )
 
     default_invoice_city = schema.TextLine(
-        title=_(u"label_city", default=u"City"),
-        description=_(u"help_invoice_city", default=u"City of invoice sender"),
+        title=_("label_city", default="City"),
+        description=_("help_invoice_city", default="City of invoice sender"),
         required=False,
     )
 
     default_invoice_country = schema.Choice(
-        title=_(u"label_country", default=u"Country"),
-        description=_(u"help_invoice_country", default=u"Country of invoice sender"),
+        title=_("label_country", default="Country"),
+        description=_("help_invoice_country", default="Country of invoice sender"),
         required=False,
         vocabulary="bda.plone.shop.vocabularies.CountryVocabulary",
     )
 
     default_invoice_phone = schema.TextLine(
-        title=_(u"label_phone", default=u"Phone"),
+        title=_("label_phone", default="Phone"),
         description=_(
-            u"help_invoice_phone", default=u"Optional phone number of invoice sender"
+            "help_invoice_phone", default="Optional phone number of invoice sender"
         ),
         required=False,
     )
 
     default_invoice_email = schema.TextLine(
-        title=_(u"label_email", default=u"Email address"),
+        title=_("label_email", default="Email address"),
         description=_(
-            u"help_invoice_email", default=u"Optional email address of invoice sender"
+            "help_invoice_email", default="Optional email address of invoice sender"
         ),
         required=False,
     )
 
     default_invoice_web = schema.TextLine(
-        title=_(u"label_web", default=u"Web address"),
+        title=_("label_web", default="Web address"),
         description=_(
-            u"help_invoice_web", default=u"Optional web address of invoice sender"
+            "help_invoice_web", default="Optional web address of invoice sender"
         ),
         required=False,
     )
 
     default_invoice_iban = schema.TextLine(
-        title=_(u"label_iban", default=u"IBAN"),
+        title=_("label_iban", default="IBAN"),
         description=_(
-            u"help_invoice_iban", default=u"Invoice sender banking account IBAN"
+            "help_invoice_iban", default="Invoice sender banking account IBAN"
         ),
         required=False,
     )
 
     default_invoice_bic = schema.TextLine(
-        title=_(u"label_bic", default=u"BIC"),
-        description=_(
-            u"help_invoice_bic", default=u"Invoice sender banking account BIC"
-        ),
+        title=_("label_bic", default="BIC"),
+        description=_("help_invoice_bic", default="Invoice sender banking account BIC"),
         required=False,
     )
 
@@ -610,18 +595,18 @@ class IInvoiceSettings(model.Schema):
 class ILanguageAndPaymentAwareTextRow(model.Schema):
 
     payment = schema.Choice(
-        title=_(u"payment", default=u"Payment"),
+        title=_("payment", default="Payment"),
         vocabulary="bda.plone.shop.vocabularies.PaymentMethodsVocabulary",
         required=False,
     )
 
     lang = schema.Choice(
-        title=_(u"language", default=u"Language"),
+        title=_("language", default="Language"),
         vocabulary="plone.app.vocabularies.SupportedContentLanguages",
         required=False,
     )
 
-    text = schema.Text(title=_(u"text", default=u"Text"), required=False)
+    text = schema.Text(title=_("text", default="Text"), required=False)
 
 
 @provider(IShopSettingsProvider)
@@ -630,7 +615,7 @@ class IPaymentTextSettings(model.Schema):
 
     model.fieldset(
         "payment",
-        label=_(u"Payment", default=u"Payment"),
+        label=_("Payment", default="Payment"),
         fields=[
             "available_payment_methods",
             "payment_method",
@@ -641,12 +626,10 @@ class IPaymentTextSettings(model.Schema):
     )
 
     available_payment_methods = schema.List(
-        title=_(
-            u"label_available_payment_methods", default=u"Available Payment Methods"
-        ),
+        title=_("label_available_payment_methods", default="Available Payment Methods"),
         description=_(
-            u"help_available_payment_methods",
-            default=u"Available payment methods in checkout",
+            "help_available_payment_methods",
+            default="Available payment methods in checkout",
         ),
         required=True,
         min_length=1,
@@ -657,26 +640,26 @@ class IPaymentTextSettings(model.Schema):
     )
 
     payment_method = schema.Choice(
-        title=_(u"label_payment_method", default=u"Payment Method"),
+        title=_("label_payment_method", default="Payment Method"),
         description=_(
-            u"help_payment_method", default=u"Default payment method in checkout"
+            "help_payment_method", default="Default payment method in checkout"
         ),
         vocabulary="bda.plone.shop.vocabularies." "PaymentMethodsVocabulary",
     )
 
     skip_payment_if_order_contains_reservations = schema.Bool(
         title=_(
-            u"label_skip_payment_if_order_contains_reservations",
-            default=u"Skip Payment if order contains reservations",
+            "label_skip_payment_if_order_contains_reservations",
+            default="Skip Payment if order contains reservations",
         ),
         required=False,
     )
 
     widget("payment_text", DataGridFieldFactory)
     payment_text = schema.List(
-        title=_(u"label_payment_text", default=u"Payment Texts"),
+        title=_("label_payment_text", default="Payment Texts"),
         value_type=DictRow(
-            title=_(u"payment_text", default="Payment Text"),
+            title=_("payment_text", default="Payment Text"),
             schema=ILanguageAndPaymentAwareTextRow,
         ),
         required=False,
@@ -684,7 +667,7 @@ class IPaymentTextSettings(model.Schema):
 
     cash_on_delivery_costs = schema.Decimal(
         title=_(
-            u"label_cash_on_delivery_costs", default=u"Cash on delivery costs in gross"
+            "label_cash_on_delivery_costs", default="Cash on delivery costs in gross"
         ),
         required=False,
     )
diff --git a/src/bda/plone/shop/mailnotify.py b/src/bda/plone/shop/mailnotify.py
index 298b4222..f4349217 100644
--- a/src/bda/plone/shop/mailnotify.py
+++ b/src/bda/plone/shop/mailnotify.py
@@ -145,4 +145,4 @@ def payment_text(self, payment):
         for entry in settings.payment_text:
             if entry["lang"] == lang and entry["payment"] == payment:
                 return entry["text"]
-        return u""
+        return ""
diff --git a/src/bda/plone/shop/setuphandlers.py b/src/bda/plone/shop/setuphandlers.py
index 0e123113..02550755 100644
--- a/src/bda/plone/shop/setuphandlers.py
+++ b/src/bda/plone/shop/setuphandlers.py
@@ -81,14 +81,12 @@ def uninstall(context):
 @implementer(Plone.INonInstallable)
 class HiddenProfiles(object):
     def getNonInstallableProfiles(self):
-        """Do not show on Plone's list of installable profiles.
-        """
+        """Do not show on Plone's list of installable profiles."""
         return []
 
 
 @implementer(QuickInstaller.INonInstallable)
 class HiddenProducts(object):
     def getNonInstallableProducts(self):
-        """Do not show on QuickInstaller's list of installable products.
-        """
+        """Do not show on QuickInstaller's list of installable products."""
         return []
diff --git a/src/bda/plone/shop/shipping.py b/src/bda/plone/shop/shipping.py
index 388020b9..abc1c808 100644
--- a/src/bda/plone/shop/shipping.py
+++ b/src/bda/plone/shop/shipping.py
@@ -13,8 +13,8 @@
 from zope.component import adapter
 from zope.deprecation import deprecated
 from zope.i18nmessageid import Message
-from zope.interface import Interface
 from zope.interface import implementer
+from zope.interface import Interface
 
 
 @implementer(IShippingSettings)
@@ -56,15 +56,15 @@ def gross(val):
 
         # no shipping costs
         if not flat_shipping_cost and not item_shipping_cost:
-            return _(u"free_shipping", default=u"Free Shipping")
+            return _("free_shipping", default="Free Shipping")
         # no free shipping limit
         if not free_shipping_limit:
             # flat and item costs defined
             if flat_shipping_cost and item_shipping_cost:
                 msg = _(
-                    u"no_free_shipping_flat_and_item",
-                    default=u"Minimum ${flat} ${currency} or ${item} "
-                    u"${currency} per item in cart",
+                    "no_free_shipping_flat_and_item",
+                    default="Minimum ${flat} ${currency} or ${item} "
+                    "${currency} per item in cart",
                 )
                 return Message(
                     msg,
@@ -77,7 +77,7 @@ def gross(val):
             # flat costs only
             if flat_shipping_cost and not item_shipping_cost:
                 msg = _(
-                    u"no_free_shipping_flat_only", default=u"Flat ${flat} ${currency}"
+                    "no_free_shipping_flat_only", default="Flat ${flat} ${currency}"
                 )
                 return Message(
                     msg,
@@ -86,8 +86,8 @@ def gross(val):
             # item costs only
             if not flat_shipping_cost and item_shipping_cost:
                 msg = _(
-                    u"no_free_shipping_item_only",
-                    default=u"${item} ${currency} per item in cart",
+                    "no_free_shipping_item_only",
+                    default="${item} ${currency} per item in cart",
                 )
                 return Message(
                     msg,
@@ -99,20 +99,20 @@ def gross(val):
             # from gross
             if shipping_limit_from_gross:
                 msg = _(
-                    u"free_shipping_limit_flat_and_item_gross",
-                    default=u"Minimum ${flat} ${currency} or "
-                    u"${item} ${currency} per item in cart. Free "
-                    u"shipping if gross purchase price above "
-                    u"${limit} ${currency}",
+                    "free_shipping_limit_flat_and_item_gross",
+                    default="Minimum ${flat} ${currency} or "
+                    "${item} ${currency} per item in cart. Free "
+                    "shipping if gross purchase price above "
+                    "${limit} ${currency}",
                 )
             # from net
             else:
                 msg = _(
-                    u"free_shipping_limit_flat_and_item_net",
-                    default=u"Minimum ${flat} ${currency} or "
-                    u"${item} ${currency} per item in cart. Free "
-                    u"shipping if net purchase price above "
-                    u"${limit} ${currency}",
+                    "free_shipping_limit_flat_and_item_net",
+                    default="Minimum ${flat} ${currency} or "
+                    "${item} ${currency} per item in cart. Free "
+                    "shipping if net purchase price above "
+                    "${limit} ${currency}",
                 )
             return Message(
                 msg,
@@ -128,18 +128,18 @@ def gross(val):
             # from gross
             if shipping_limit_from_gross:
                 msg = _(
-                    u"free_shipping_limit_flat_only_gross",
-                    default=u"Flat ${flat} ${currency}. Free "
-                    u"shipping if gross purchase price above "
-                    u"${limit} ${currency}",
+                    "free_shipping_limit_flat_only_gross",
+                    default="Flat ${flat} ${currency}. Free "
+                    "shipping if gross purchase price above "
+                    "${limit} ${currency}",
                 )
             # from net
             else:
                 msg = _(
-                    u"free_shipping_limit_flat_only_net",
-                    default=u"Flat ${flat} ${currency}. Free "
-                    u"shipping if net purchase price above "
-                    u"${limit} ${currency}",
+                    "free_shipping_limit_flat_only_net",
+                    default="Flat ${flat} ${currency}. Free "
+                    "shipping if net purchase price above "
+                    "${limit} ${currency}",
                 )
             return Message(
                 msg,
@@ -154,18 +154,18 @@ def gross(val):
             # from gross
             if shipping_limit_from_gross:
                 msg = _(
-                    u"free_shipping_limit_item_only_gross",
-                    default=u"${item} ${currency} per item in "
-                    u"cart. Free shipping if gross purchase "
-                    u"price above ${limit} ${currency}",
+                    "free_shipping_limit_item_only_gross",
+                    default="${item} ${currency} per item in "
+                    "cart. Free shipping if gross purchase "
+                    "price above ${limit} ${currency}",
                 )
             # from net
             else:
                 msg = _(
-                    u"free_shipping_limit_item_only_net",
-                    default=u"${item} ${currency} per item in "
-                    u"cart. Free shipping if net purchase "
-                    u"price above ${limit} ${currency}",
+                    "free_shipping_limit_item_only_net",
+                    default="${item} ${currency} per item in "
+                    "cart. Free shipping if net purchase "
+                    "price above ${limit} ${currency}",
                 )
             return Message(
                 msg,
diff --git a/src/bda/plone/shop/tests/__init__.py b/src/bda/plone/shop/tests/__init__.py
index 4a76af7f..74be210e 100644
--- a/src/bda/plone/shop/tests/__init__.py
+++ b/src/bda/plone/shop/tests/__init__.py
@@ -3,13 +3,13 @@
 from plone.app.robotframework.testing import MOCK_MAILHOST_FIXTURE
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
+from plone.app.testing import login
+from plone.app.testing import logout
 from plone.app.testing import PLONE_FIXTURE
 from plone.app.testing import PloneSandboxLayer
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import TEST_USER_NAME
-from plone.app.testing import login
-from plone.app.testing import logout
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.testing import z2
 from zope.component import getUtility
diff --git a/src/bda/plone/shop/tests/test_user.py b/src/bda/plone/shop/tests/test_user.py
index 8e90a7be..309e8d0f 100644
--- a/src/bda/plone/shop/tests/test_user.py
+++ b/src/bda/plone/shop/tests/test_user.py
@@ -16,8 +16,7 @@ def setUp(self):
         set_browserlayer(self.request)
 
     def test_is_customer(self):
-        """Test if a newly created user is granted the "Customer" role.
-        """
+        """Test if a newly created user is granted the "Customer" role."""
         self.assertTrue(get_shop_settings().add_customer_role_to_new_users)
         plone.api.user.create(
             email="user@test.com", username="testuser", password="testuser"
diff --git a/src/bda/plone/shop/upgrades/upgrades.py b/src/bda/plone/shop/upgrades/upgrades.py
index 7f32316a..93e8a26e 100644
--- a/src/bda/plone/shop/upgrades/upgrades.py
+++ b/src/bda/plone/shop/upgrades/upgrades.py
@@ -6,8 +6,10 @@
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from zope.component import getUtility
+
 import logging
 
+
 HAS_PLONE5 = parse_version(env.plone_version()) >= parse_version("5.0b2")
 logger = logging.getLogger("bda.plone.shop UPGRADE")
 
@@ -29,7 +31,7 @@ def install_userproperties_pas_plugin(context):
 
 
 def remove_old_resources(context):
-    """ Remove old resources for Plone 5"""
+    """Remove old resources for Plone 5"""
 
     portal_css = getToolByName(context, "portal_css")
     old_css = (
diff --git a/src/bda/plone/shop/user/properties.py b/src/bda/plone/shop/user/properties.py
index 4bb64b39..4c6c8381 100644
--- a/src/bda/plone/shop/user/properties.py
+++ b/src/bda/plone/shop/user/properties.py
@@ -13,7 +13,7 @@
 
 @implementer(IPropertiesPlugin)
 class UserPropertiesPASPlugin(BasePlugin):
-    """ An implementer of IPropertiesPlugin which
+    """An implementer of IPropertiesPlugin which
     provides the method getPropertiesForUser, this method
     adds computed properties to PlonePAS which we remove
     at another place.
@@ -26,7 +26,7 @@ def __init__(self, id, title=None):
         self.title = title
 
     def _getPropertSheetsFromUser(self, user):
-        """ Get PropertySheets from a IPropertiedUser without
+        """Get PropertySheets from a IPropertiedUser without
         the current sheet, so we dont have recursions.
         """
         sheet_ids = user.listPropertysheets()
@@ -39,7 +39,7 @@ def _getPropertSheetsFromUser(self, user):
         return result
 
     def getPropertiesForUser(self, user, request=None):
-        """ This can't use plone.api.user.get(user.getId()) as it would
+        """This can't use plone.api.user.get(user.getId()) as it would
         lead to a recursion.
         """
 
@@ -53,25 +53,23 @@ def getProperty(id, default):
 
             return safe_unicode(default)
 
-        first = safe_unicode(getProperty("firstname", u""))
-        last = safe_unicode(getProperty("lastname", u""))
-        street = safe_unicode(getProperty("street", u""))
-        zip_code = safe_unicode(getProperty("zip", u""))
-        city = safe_unicode(getProperty("city", u""))
-        country = safe_unicode(getProperty("country", u""))
+        first = safe_unicode(getProperty("firstname", ""))
+        last = safe_unicode(getProperty("lastname", ""))
+        street = safe_unicode(getProperty("street", ""))
+        zip_code = safe_unicode(getProperty("zip", ""))
+        city = safe_unicode(getProperty("city", ""))
+        country = safe_unicode(getProperty("country", ""))
 
         try:
             country = country and get_pycountry_name(country) or ""
         except KeyError:
             country = ""
 
-        join_list = [street, u"{0} {1}".format(zip_code, city), country]
+        join_list = [street, "{0} {1}".format(zip_code, city), country]
 
         return {
-            "fullname": u"{0}{1}{2}".format(
-                first, u" " if first and last else u"", last
-            ),
-            "location": u", ".join([it for it in join_list if it]),
+            "fullname": "{0}{1}{2}".format(first, " " if first and last else "", last),
+            "location": ", ".join([it for it in join_list if it]),
         }
 
 
diff --git a/src/bda/plone/shop/user/userdata.py b/src/bda/plone/shop/user/userdata.py
index 1759deac..747d3d2b 100644
--- a/src/bda/plone/shop/user/userdata.py
+++ b/src/bda/plone/shop/user/userdata.py
@@ -21,7 +21,7 @@ class ICustomer(model.Schema):
 
     model.fieldset(
         "main_address",
-        _("main_address", u"Main Address"),
+        _("main_address", "Main Address"),
         fields=[
             "firstname",
             "lastname",
@@ -37,7 +37,7 @@ class ICustomer(model.Schema):
 
     model.fieldset(
         "delivery_address",
-        _("delivery_address", u"Delivery Address"),
+        _("delivery_address", "Delivery Address"),
         fields=[
             "delivery_firstname",
             "delivery_lastname",
@@ -49,129 +49,129 @@ class ICustomer(model.Schema):
         ],
     )
 
-    model.fieldset("legal", _("legal", u"Legal"), fields=["accept"])
+    model.fieldset("legal", _("legal", "Legal"), fields=["accept"])
 
     # Personal Data
     gender = schema.Choice(
-        title=_(u"label_gender", default=u"Gender"),
-        description=_(u"help_gender", default=u""),
+        title=_("label_gender", default="Gender"),
+        description=_("help_gender", default=""),
         required=False,
         vocabulary="bda.plone.shop.vocabularies.GenderVocabulary",
     )
 
     firstname = schema.TextLine(
-        title=_(u"label_firstname", default=u"First name"),
-        description=_(u"help_firstname", default=u"Fill in your given name."),
+        title=_("label_firstname", default="First name"),
+        description=_("help_firstname", default="Fill in your given name."),
         required=True,
     )
 
     lastname = schema.TextLine(
-        title=_(u"label_lastname", default=u"Last name"),
+        title=_("label_lastname", default="Last name"),
         description=_(
-            u"help_lastname", default=u"Fill in your surname or your family name."
+            "help_lastname", default="Fill in your surname or your family name."
         ),
         required=True,
     )
 
     phone = schema.TextLine(
-        title=_(u"label_phone", default=u"Phone"),
-        description=_(u"help_phone", default=u""),
+        title=_("label_phone", default="Phone"),
+        description=_("help_phone", default=""),
         required=True,
     )
 
     company = schema.TextLine(
-        title=_(u"label_company", default=u"Company"),
-        description=_(u"help_company", default=u""),
+        title=_("label_company", default="Company"),
+        description=_("help_company", default=""),
         required=False,
     )
 
     # Billing Address
     street = schema.TextLine(
-        title=_(u"label_street", default=u"Street"),
-        description=_(u"help_street", default=u""),
+        title=_("label_street", default="Street"),
+        description=_("help_street", default=""),
         required=True,
     )
 
     zip = schema.TextLine(
-        title=_(u"label_zip", default=u"Postal Code"),
-        description=_(u"help_zip", default=u""),
+        title=_("label_zip", default="Postal Code"),
+        description=_("help_zip", default=""),
         required=True,
     )
 
     city = schema.TextLine(
-        title=_(u"label_city", default=u"City"),
-        description=_(u"help_city", default=u""),
+        title=_("label_city", default="City"),
+        description=_("help_city", default=""),
         required=True,
     )
 
     country = schema.Choice(
-        title=_(u"label_country", default=u"Country"),
-        description=_(u"help_country", default=u""),
+        title=_("label_country", default="Country"),
+        description=_("help_country", default=""),
         required=True,
         vocabulary="bda.plone.shop.vocabularies.CountryVocabulary",
     )
 
     # Delivery Address
     delivery_alternative_delivery = schema.Bool(
-        title=_(u"label_alternative_delivery", default=u"Alternative delivery address"),
+        title=_("label_alternative_delivery", default="Alternative delivery address"),
         description=_(
-            u"help_alternative_delivery",
-            default=u"Delivery address is different from billing " u"address.",
+            "help_alternative_delivery",
+            default="Delivery address is different from billing " "address.",
         ),
         required=False,
     )
 
     delivery_firstname = schema.TextLine(
-        title=_(u"label_firstname", default=u"First name"),
-        description=_(u"help_firstname", default=u"Fill in your given name."),
+        title=_("label_firstname", default="First name"),
+        description=_("help_firstname", default="Fill in your given name."),
         required=False,
     )
 
     delivery_lastname = schema.TextLine(
-        title=_(u"label_lastname", default=u"Last name"),
+        title=_("label_lastname", default="Last name"),
         description=_(
-            u"help_lastname", default=u"Fill in your surname or your family name."
+            "help_lastname", default="Fill in your surname or your family name."
         ),
         required=False,
     )
 
     delivery_company = schema.TextLine(
-        title=_(u"label_company", default=u"Company"),
-        description=_(u"help_company", default=u""),
+        title=_("label_company", default="Company"),
+        description=_("help_company", default=""),
         required=False,
     )
 
     delivery_street = schema.TextLine(
-        title=_(u"label_street", default=u"Street"),
-        description=_(u"help_street", default=u""),
+        title=_("label_street", default="Street"),
+        description=_("help_street", default=""),
         required=False,
     )
 
     delivery_zip = schema.TextLine(
-        title=_(u"label_zip", default=u"Postal Code"),
-        description=_(u"help_zip", default=u""),
+        title=_("label_zip", default="Postal Code"),
+        description=_("help_zip", default=""),
         required=False,
     )
 
     delivery_city = schema.TextLine(
-        title=_(u"label_city", default=u"City"),
-        description=_(u"help_city", default=u""),
+        title=_("label_city", default="City"),
+        description=_("help_city", default=""),
         required=False,
     )
 
     delivery_country = schema.Choice(
-        title=_(u"label_country", default=u"Country"),
-        description=_(u"help_country", default=u""),
+        title=_("label_country", default="Country"),
+        description=_("help_country", default=""),
         required=False,
         vocabulary="bda.plone.shop.vocabularies.CountryVocabulary",
     )
 
     # Terms and Conditions
     accept = schema.Bool(
-        title=_(u"label_accept", default=u"Accept terms of use"),
+        title=_("label_accept", default="Accept terms of use"),
         description=_(
-            u"help_accept",
-            default=u"Tick this box to indicate that you have found,"
+            "help_accept",
+            default="Tick this box to indicate that you have found,"
             " read and accepted the terms of use for this site.",
         ),
         required=False,
@@ -218,8 +218,7 @@ def update(self):
 @implementer(ICheckoutFormPresets)
 @adapter(Interface, IShopExtensionLayer)
 class CheckoutFormMemberPresets(object):
-    """Adapter to retrieve member presets for checkout form.
-    """
+    """Adapter to retrieve member presets for checkout form."""
 
     def __init__(self, context, request):
         self.context = context
diff --git a/src/bda/plone/shop/vocabularies.py b/src/bda/plone/shop/vocabularies.py
index eefaf63a..52c4f696 100644
--- a/src/bda/plone/shop/vocabularies.py
+++ b/src/bda/plone/shop/vocabularies.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
+from bda.plone.cart.shipping import Shippings
 from bda.plone.checkout.vocabularies import country_vocabulary
 from bda.plone.checkout.vocabularies import gender_vocabulary
 from bda.plone.payment import Payments
-from bda.plone.cart.shipping import Shippings
 from bda.plone.shop import message_factory as _
 from bda.plone.shop.utils import get_shop_article_settings
 from bda.plone.shop.utils import get_shop_tax_settings
@@ -48,7 +48,7 @@ def QuantityUnitVocabulary(context):
         terms.append(
             SimpleTerm(
                 value=quantity_unit,
-                title=AVAILABLE_QUANTITY_UNITS.get(quantity_unit, quantity_unit)
+                title=AVAILABLE_QUANTITY_UNITS.get(quantity_unit, quantity_unit),
             )
         )
     return SimpleVocabulary(terms)
@@ -140,8 +140,7 @@ def GenderVocabulary(context):
 
 @provider(IVocabularyFactory)
 def CountryVocabulary(context):
-    """VocabularyFactory for countries from ISO3166 source.
-    """
+    """VocabularyFactory for countries from ISO3166 source."""
     return SimpleVocabulary(
         [SimpleTerm(value=k, title=v) for k, v in country_vocabulary()]
     )

From d7c09f441945acc31a988eec0de73388a6d105e1 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Mon, 18 Jul 2022 11:07:07 +0200
Subject: [PATCH 42/74] update setup.py

---
 setup.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/setup.py b/setup.py
index 8e66f556..8fecced8 100644
--- a/setup.py
+++ b/setup.py
@@ -16,19 +16,25 @@
     description=shortdesc,
     long_description=longdesc,
     classifiers=[
-        'Framework :: Plone',
-        'Framework :: Plone :: Addon',
-        'Framework :: Plone :: 5.1',
-        'Framework :: Plone :: 5.2',
-        'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
+        "Framework :: Plone",
+        "Framework :: Plone :: 6.0",
+        "Framework :: Plone :: Addon",
+        "Framework :: Zope",
+        "Framework :: Zope :: 5",
+        "License :: OSI Approved :: GNU General Public License (GPL)",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     author='BlueDynamics Alliance',
     author_email='dev@bluedynamics.com',
     license='GNU General Public Licence',
     packages=find_packages('src'),
     package_dir={'': 'src'},
+    python_requires='>=3.7',
     namespace_packages=['bda', 'bda.plone'],
     include_package_data=True,
     zip_safe=False,
@@ -36,13 +42,10 @@
         'bda.plone.discount',
         'bda.plone.orders',
         'collective.z3cform.datagridfield',
-        'Products.CMFPlone',
-        'plone.api>=1.3.0',
-        'plone.app.users>=2.0',
-        'plone.app.workflow>=2.1.9',
+        'Products.CMFPlone>=6.0a1',
+        'plone.api',
         'setuptools',
         'zope.deferredimport',
-        'z3c.form>=3.2.4',  # Issue #55
         'zope.schema>=3.4',  # Decimal field
     ],
     extras_require={

From d1cb219693688c080789ff1b451dc563db64b4db Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Mon, 18 Jul 2022 11:53:07 +0200
Subject: [PATCH 43/74] update README

---
 README.rst | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/README.rst b/README.rst
index f600f61d..d6456045 100644
--- a/README.rst
+++ b/README.rst
@@ -4,8 +4,8 @@ bda.plone.shop
 
 E-commerce solution for `Plone <http://plone.com>`_
 
-.. image:: https://travis-ci.org/bluedynamics/bda.plone.shop.svg?branch=master
-    :target: https://travis-ci.org/bluedynamics/bda.plone.shop
+.. image:: https://github.com/bluedynamics/bda.plone.shop/actions/workflows/main.yml/badge.svg
+    :target: https://github.com/bluedynamics/bda.plone.shop/actions/workflows/main.yml
 
 .. image:: https://black.readthedocs.io/en/stable/_static/pypi.svg
     :target: https://pypi.org/project/black/
@@ -17,28 +17,17 @@ Installation
 Depend your instance to ``bda.plone.shop`` and install it as addon in plone
 control panel.
 
-``bda.plone.shop`` won't work on stock Plone 4.3.x installations because it
-requires some packages in more recent versions:
-
-* ``plone.app.workflow`` >= 2.1.8
-
-* ``plone.app.users`` >= 2.0.4
-
-See the Troubleshooting_ section for more information.
-
 
 Development and testing
 =======================
 
 Checkout ``bda.plone.shop`` from
-``git://github.com/bluedynamics/bda.plone.shop.git`` and run contained buidlout
-like so::
+``git://github.com/bluedynamics/bda.plone.shop.git`` and run::
 
-    ~$ virtualenv .
-    ~$ ./bin/pip install zc.buildout
-    ~$ ./bin/buildout
+    ~$ make install
 
-Start instance and create Plone site with shop profile applied.
+This installs all dependencies with ``mxdev`` and prepares scripts for
+running tests.
 
 
 Running tests
@@ -46,30 +35,27 @@ Running tests
 
 If you have run the buildout, you can run all tests like so::
 
-    ./bin/test -s bda.plone.shop
-
-The -t switch allows you to run a specific test file or method. The
-``--list-tests`` lists all available tests.
+    ~$ make test-ignore-warnings
 
 To run the robot tests do::
 
-    ./bin/test --all -s bda.plone.shop -t robot
+    ./venv/bin/zope-testrunner --auto-color --auto-progress --test-path=./src --all
 
 For development, it might be more convenient to start a test server and run
 robot tests individually, like so (-d to start Zope in DEBUG-MODE)::
 
-    ./bin/robot-server bda.plone.shop.tests.ShopDXFull_ROBOT_TESTING -d
-    ./bin/robot src/bda/plone/shop/tests/robot/test_shop_orderprocess.robot
+    ./venv/bin/robot-server bda.plone.shop.tests.ShopDXFull_ROBOT_TESTING -d
+    ./venv/bin/robot src/bda/plone/shop/tests/robot/test_shop_orderprocess.robot
 
 To automatically land in the debug shell on test-failure, use::
 
-    ./bin/robot-debug src/bda/plone/shop/tests/robot/test_shop_orderprocess.robot
+    ./venv/bin/robot-debug src/bda/plone/shop/tests/robot/test_shop_orderprocess.robot
 
 In the robot test you can place the debug statement to access a robot shell to
 try things out.
 
 For more information on this topic visit:
-http://developer.plone.org/reference_manuals/external/plone.app.robotframework/happy.html
+https://docs.plone.org/external/plone.app.robotframework/docs/source/happy.html
 
 
 Enable Content to be buyable
@@ -327,3 +313,4 @@ Authors
 - Jure Cerjak
 - Benjamin Stefaner
 - Jens Klein
+

From fcec7947d6cf2432f27dce348a0700361a8eb6fa Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Fri, 19 Aug 2022 08:06:17 +0200
Subject: [PATCH 44/74] concat string

---
 src/bda/plone/shop/interfaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 335f4266..19fa7635 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -195,7 +195,7 @@ class IShopArticleSettings(model.Schema):
         required=False,
         missing_value=set(["quantity"]),
         value_type=schema.Choice(
-            vocabulary="bda.plone.shop.vocabularies." "AvailableQuantityUnitVocabulary"
+            vocabulary="bda.plone.shop.vocabularies.AvailableQuantityUnitVocabulary"
         ),
     )
 

From 92fedddc22ddeaa9954a5095c2a93de4df98946d Mon Sep 17 00:00:00 2001
From: toalba <tb@kleinundpartner.at>
Date: Mon, 6 Feb 2023 14:37:06 +0100
Subject: [PATCH 45/74] add changes mx.ini and instance.yaml

---
 instance.yaml | 8 ++++++++
 mx.ini        | 8 +++-----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 instance.yaml

diff --git a/instance.yaml b/instance.yaml
new file mode 100644
index 00000000..79fb763b
--- /dev/null
+++ b/instance.yaml
@@ -0,0 +1,8 @@
+default_context:
+    initial_user_name: 'admin'
+    initial_user_password: 'admin'
+
+    load_zcml:
+        package_includes: ['bda.plone.shop']
+
+    db_storage: direct
diff --git a/mx.ini b/mx.ini
index 0cb10217..fd4b78da 100644
--- a/mx.ini
+++ b/mx.ini
@@ -14,15 +14,13 @@ requirements-out = requirements-mxdev.txt
 ignores =
     bda.plone.shop
 
-version-overrides =
-    webresource==1.1
 
 # default-install-mode = direct
 
 # variables
 ; github = git+ssh://git@github.com
 github = git+https://github.com
-
+conestack = git@github.com:conestack
 [bda.plone.cart]
 url = ${settings:github}/bluedynamics/bda.plone.cart.git
 branch = bootstrap-plone6
@@ -58,9 +56,9 @@ url = ${settings:github}/bluedynamics/yafowil.plone.git
 branch = bootstrap-plone6
 
 [yafowil.bootstrap]
-url = ${settings:github}/bluedynamics/yafowil.bootstrap.git
+url = ${settings:conestack}yafowil.bootstrap.git
 branch = 2.0
 
 [yafowil]
-url = ${settings:github}/bluedynamics/yafowil.git
+url = ${settings:conestack}/yafowil.git
 branch = master

From cb494ea7f34a69cd2d3740d78aa4d03e74f6395e Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Mon, 6 Feb 2023 17:39:23 +0100
Subject: [PATCH 46/74] Fix checkout URL

---
 .gitignore | 1 +
 mx.ini     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 26d7f150..5b621a83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@
 lib64
 /.Python
 .python-version
+/venv/
 
 # mxdev
 .make-sentinels/
diff --git a/mx.ini b/mx.ini
index fd4b78da..485125d8 100644
--- a/mx.ini
+++ b/mx.ini
@@ -56,7 +56,7 @@ url = ${settings:github}/bluedynamics/yafowil.plone.git
 branch = bootstrap-plone6
 
 [yafowil.bootstrap]
-url = ${settings:conestack}yafowil.bootstrap.git
+url = ${settings:conestack}/yafowil.bootstrap.git
 branch = 2.0
 
 [yafowil]

From d0056eedd8109becc8b066a14c40bd52815d1936 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Mon, 6 Feb 2023 17:52:40 +0100
Subject: [PATCH 47/74] default_invoice_country requires a value

---
 .gitignore                                       | 1 +
 src/bda/plone/shop/profiles/default/registry.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5b621a83..4240efc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ lib64
 /.Python
 .python-version
 /venv/
+/instance/
 
 # mxdev
 .make-sentinels/
diff --git a/src/bda/plone/shop/profiles/default/registry.xml b/src/bda/plone/shop/profiles/default/registry.xml
index 93f1783d..65d41fad 100644
--- a/src/bda/plone/shop/profiles/default/registry.xml
+++ b/src/bda/plone/shop/profiles/default/registry.xml
@@ -88,7 +88,7 @@
     <value key="default_invoice_street" purge="false"></value>
     <value key="default_invoice_zip" purge="false"></value>
     <value key="default_invoice_city" purge="false"></value>
-    <value key="default_invoice_country" purge="false"></value>
+    <value key="default_invoice_country" purge="false">040</value>
     <value key="default_invoice_phone" purge="false"></value>
     <value key="default_invoice_email" purge="false"></value>
     <value key="default_invoice_web" purge="false"></value>

From bb48a63a6a1597294762454fb9849d7106cb7757 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Mon, 6 Feb 2023 18:00:20 +0100
Subject: [PATCH 48/74] minor formatting

---
 src/bda/plone/shop/interfaces.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 19fa7635..47d82cf4 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -90,7 +90,7 @@ class IShopSettings(model.Schema):
     show_currency = schema.Choice(
         title=_("label_show_currency", default="Show the currency for items"),
         description=_("help_show_currency", default=""),
-        vocabulary="bda.plone.shop.vocabularies." "CurrencyDisplayOptionsVocabulary",
+        vocabulary="bda.plone.shop.vocabularies.CurrencyDisplayOptionsVocabulary",
     )
 
 
@@ -310,7 +310,7 @@ class IShopShippingSettings(model.Schema):
         description=_(
             "help_shipping_method", default="Default shipping method in checkout"
         ),
-        vocabulary="bda.plone.shop.vocabularies." "ShippingMethodsVocabulary",
+        vocabulary="bda.plone.shop.vocabularies.ShippingMethodsVocabulary",
     )
 
     shipping_vat = schema.Choice(
@@ -426,7 +426,7 @@ class INotificationTextSettings(
     order_text = schema.List(
         title=_(
             "label_site_item_notification_text",
-            default="Default notification text for items in order " "confirmation mail",
+            default="Default notification text for items in order confirmation mail",
         ),
         value_type=DictRow(
             title=_("order_text", default="Order Text"), schema=ILanguageAwareTextRow
@@ -644,7 +644,7 @@ class IPaymentTextSettings(model.Schema):
         description=_(
             "help_payment_method", default="Default payment method in checkout"
         ),
-        vocabulary="bda.plone.shop.vocabularies." "PaymentMethodsVocabulary",
+        vocabulary="bda.plone.shop.vocabularies.PaymentMethodsVocabulary",
     )
 
     skip_payment_if_order_contains_reservations = schema.Bool(

From 80008b177c3539ec53bc1b0a551024701823ab50 Mon Sep 17 00:00:00 2001
From: toalba <tb@kleinundpartner.at>
Date: Tue, 7 Feb 2023 09:00:29 +0100
Subject: [PATCH 49/74] add /instance/ and /robot/ to gitignore

---
 .gitignore                                       | 2 ++
 src/bda/plone/shop/profiles/default/registry.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5b621a83..deb4539e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,8 @@ lib64
 /.Python
 .python-version
 /venv/
+/robot/
+/instance/
 
 # mxdev
 .make-sentinels/
diff --git a/src/bda/plone/shop/profiles/default/registry.xml b/src/bda/plone/shop/profiles/default/registry.xml
index 93f1783d..65d41fad 100644
--- a/src/bda/plone/shop/profiles/default/registry.xml
+++ b/src/bda/plone/shop/profiles/default/registry.xml
@@ -88,7 +88,7 @@
     <value key="default_invoice_street" purge="false"></value>
     <value key="default_invoice_zip" purge="false"></value>
     <value key="default_invoice_city" purge="false"></value>
-    <value key="default_invoice_country" purge="false"></value>
+    <value key="default_invoice_country" purge="false">040</value>
     <value key="default_invoice_phone" purge="false"></value>
     <value key="default_invoice_email" purge="false"></value>
     <value key="default_invoice_web" purge="false"></value>

From 54b7a191a907612d9db1593a575ae8f913143268 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Tue, 7 Feb 2023 10:22:32 +0100
Subject: [PATCH 50/74] Generate makefile with mxmake

---
 .gitignore  |  47 ++---
 LICENSE.rst |   2 +-
 Makefile    | 592 ++++++++++++++++++++++++++++++----------------------
 mx.ini      |   1 -
 4 files changed, 351 insertions(+), 291 deletions(-)

diff --git a/.gitignore b/.gitignore
index deb4539e..3cd1d755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,45 +1,22 @@
+*.egg-info
+*.mo
 *.pyc
+.DS_Store
+.mxmake/
+/*-mxdev.txt
 /.project
 /.pydevproject
-/.mr.developer.cfg
-/.installed.cfg
 /.settings/
 /.vscode/
-/pyvenv.cfg
-/buildout.cfg
-/bin/
+/coverage/
 /develop-eggs/
-/devsrc/
+/dist/
 /eggs/
-/include/
-/lib/
-/local/
+/instance/
+/node_modules/
 /parts/
-/var/
-/src/bda.plone.shop.egg-info/
-*.mo
-.DS_Store
-/vpython/
-/env/
-/coverage/
+/pyvenv.cfg
 /report/
-/dist/
-/log.html
-/output.xml
-/report.html
-/selenium-screenshot-1.png
-/pip-selfcheck.json
-/share/
-/node_modules/
-lib64
-/.Python
-.python-version
+/sources/
+/var/
 /venv/
-/robot/
-/instance/
-
-# mxdev
-.make-sentinels/
-sources/
-/*-mxdev.txt
-.installed.txt
diff --git a/LICENSE.rst b/LICENSE.rst
index 2c2a4276..01b29aba 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -2,7 +2,7 @@
 License
 =======
 
-Copyright (c) 2012-2019, BlueDynamics Alliance, Austria
+Copyright (c) 2012-2023, BlueDynamics Alliance, Austria
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Makefile b/Makefile
index 90e78905..f1f31cc0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,98 @@
-# Makefile to configure and run Plone instance
+##############################################################################
+# THIS FILE IS GENERATED BY MXMAKE
+#
+# DOMAINS:
+#: applications.cookiecutter
+#: applications.zope
+#: core.base
+#: core.mxenv
+#: core.mxfiles
+#: core.packages
+#: core.sources
+#
+# SETTINGS (ALL CHANGES MADE BELOW SETTINGS WILL BE LOST)
+##############################################################################
+
+## core.base
+
+# `deploy` target dependencies.
+# No default value.
+DEPLOY_TARGETS?=
+
+# Additional files and folders to remove when running clean target
+# No default value.
+CLEAN_FS?=
+
+## core.mxenv
+
+# Python interpreter to use.
+# Default: python3
+PYTHON_BIN?=python3
+
+# Minimum required Python version.
+# Default: 3.7
+PYTHON_MIN_VERSION?=3.7
+
+# Flag whether to use virtual environment.
+# If `false`, the interpreter according to `PYTHON_BIN` found in `PATH` is used.
+# Default: true
+VENV_ENABLED?=true
+
+# Flag whether to create a virtual environment. If set to `false`
+# and `VENV_ENABLED` is `true`, `VENV_FOLDER` is expected to point to an
+# existing virtual environment.
+# Default: true
+VENV_CREATE?=true
+
+# The folder of the virtual environment.
+# If `VENV_ENABLED` is `true` and `VENV_CREATE` is true it is used as the target folder for the virtual environment.
+# If `VENV_ENABLED` is `true` and `VENV_CREATE` is false it is expected to point to an existing virtual environment.
+# If `VENV_ENABLED` is `false` it is ignored.
+# Default: venv
+VENV_FOLDER?=venv
+
+# mxdev to install in virtual environment.
+# Default: https://github.com/mxstack/mxdev/archive/main.zip
+MXDEV?=https://github.com/mxstack/mxdev/archive/main.zip
+
+# mxmake to install in virtual environment.
+# Default: https://github.com/mxstack/mxmake/archive/develop.zip
+MXMAKE?=https://github.com/mxstack/mxmake/archive/develop.zip
+
+## core.mxfiles
+
+# The config file to use.
+# Default: mx.ini
+PROJECT_CONFIG?=mx.ini
+
+## applications.zope
+
+# cookiecutter configuration file to use
+# Default: instance.yaml
+ZOPE_CONFIGURATION_FILE?=instance.yaml
+
+# cookiecutter configuration file to use
+# Default: https://github.com/plone/cookiecutter-zope-instance
+ZOPE_TEMPLATE?=https://github.com/plone/cookiecutter-zope-instance
+
+# The Zope folder "instance" will be generated relative to this existing folder.
+# Default: .
+ZOPE_BASE_FOLDER?=.
 
+# script to run
+# Default: No Default
+ZOPE_SCRIPTNAME?=No Default
+
+##############################################################################
+# END SETTINGS - DO NOT EDIT BELOW THIS LINE
 ##############################################################################
-# SETUP MAKE
 
-## Defensive settings for make: https://tech.davis-hansson.com/p/make/
+INSTALL_TARGETS?=
+DIRTY_TARGETS?=
+CLEAN_TARGETS?=
+PURGE_TARGETS?=
+
+# Defensive settings for make: https://tech.davis-hansson.com/p/make/
 SHELL:=bash
 .ONESHELL:
 # for Makefile debugging purposes add -x to the .SHELLFLAGS
@@ -13,301 +102,296 @@ SHELL:=bash
 MAKEFLAGS+=--warn-undefined-variables
 MAKEFLAGS+=--no-builtin-rules
 
-# Colors
-# OK=Green, warn=yellow, error=red
-ifeq ($(TERM),)
-# no colors if not in terminal
-	MARK_COLOR=
-	OK_COLOR=
-	WARN_COLOR=
-	ERROR_COLOR=
-	NO_COLOR=
-else
-	MARK_COLOR=`tput setaf 6`
-	OK_COLOR=`tput setaf 2`
-	WARN_COLOR=`tput setaf 3`
-	ERROR_COLOR=`tput setaf 1`
-	NO_COLOR=`tput sgr0`
-endif
-
-##############################################################################
-# SETTINGS AND VARIABLE
-# adjust to your project needs
-PROJECT_NAME=bda.plone.shop
-IMAGE_NAME=${PROJECT_NAME}
-CONSTRAINTS=constraints.txt
-PIP_REQUIREMENTS_IN_FILE=requirements.txt
-ADDONBASE=./
-ADDONFOLDER=${ADDONBASE}src/
-# it is possible to define an alternative YAML file for the the instance.set default i
-INSTANCE_YAML?=instance.yaml
-INSTANCE_FOLDER?=instance
-
-PIP_PARAMS= --pre
+# mxmake folder
+MXMAKE_FOLDER?=.mxmake
 
-##############################################################################
-# targets and prerequisites
-# target has to be one file, otherwise step gets executes for each file separate
-PREPARE_PREREQUISITES=${PIP_REQUIREMENTS_IN_FILE} ${CONSTRAINTS} mx.ini ${ADDONBASE}setup.cfg
-PREPARE_TARGET=requirements-mxdev.txt
-INSTALL_PREREQUSISTES=${PREPARE_TARGET}
-INSTALL_TARGET=.installed.txt
-INSTANCE_PREREQUISITES=${INSTALL_TARGET} ${INSTANCE_YAML}
-INSTANCE_TARGET=${INSTANCE_FOLDER}/etc/zope.ini ${INSTANCE_FOLDER}/etc/zope.conf ${INSTANCE_FOLDER}/etc/site.zcml
-TEST_PREREQUISITES=${INSTALL_TARGET}
-RUN_PREREQUISITES=${INSTANCE_TARGET}
+# Sentinel files
+SENTINEL_FOLDER?=$(MXMAKE_FOLDER)/sentinels
+SENTINEL?=$(SENTINEL_FOLDER)/about.txt
+$(SENTINEL):
+	@mkdir -p $(SENTINEL_FOLDER)
+	@echo "Sentinels for the Makefile process." > $(SENTINEL)
 
 ##############################################################################
-# CONVINIENCE
-
-# install and run
-.PHONY: all # full install, test and run
-all:style test run
-
-# Add the following 'help' target to your Makefile
-# And add help text after each target name starting with '\#\#'
-.PHONY: help
-help: ## This help message
-	@echo "${OK_COLOR}This is the Makefile for ${WARN_COLOR}${PROJECT_NAME}${NO_COLOR}"
-	@echo
-	@echo "${WARN_COLOR}Additional parameters:${NO_COLOR}"
-	@echo "${MARK_COLOR}PYTHON${NO_COLOR}:      Python interpreter to be used (default: python3)"
-	@echo "${MARK_COLOR}VENV${NO_COLOR}:        [on|off] wether to create a Python virtual environment or not (default: on)"s
-	@echo "${MARK_COLOR}VENV_FOLDER${NO_COLOR}: location of the virtual environment (default: ./venv)"
-	@echo
-	@echo "${WARN_COLOR}Targets:${NO_COLOR}"
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
+# mxenv
 ##############################################################################
-# targets and prerequisites
-# target has to be one file, otherwise step gets executes for each file separate
-PREPARE_PREREQUISITES=${PIP_REQUIREMENTS_IN_FILE} ${CONSTRAINTS} mx.ini ${ADDONBASE}setup.cfg
-PREPARE_TARGET=requirements-mxdev.txt
-INSTALL_PREREQUSISTES=${PREPARE_TARGET}
-INSTALL_TARGET=.installed.txt
-INSTANCE_PREREQUISITES=${INSTALL_TARGET} ${INSTANCE_YAML}
-INSTANCE_TARGET=${INSTANCE_FOLDER}/etc/zope.ini ${INSTANCE_FOLDER}/etc/zope.conf ${INSTANCE_FOLDER}/etc/site.zcml
-TEST_PREREQUISITES=${INSTALL_TARGET}
-RUN_PREREQUISITES=${INSTANCE_TARGET}
 
-##############################################################################
-# BASE
-
-SENTINELFOLDER=.make-sentinels/
-SENTINEL=${SENTINELFOLDER}ABOUT.txt
-${SENTINEL}:
-	@mkdir -p ${SENTINELFOLDER}
-	@echo "Sentinels for the Makefile process." > ${SENTINEL}
-
-# PYTHON, VENV, PIP
-# venv and pybin
-PYTHON?=python3
-VENV?=on
-ifeq ("${VENV}", "on")
-	VENV_FOLDER?=./venv
-	PYBIN=${VENV_FOLDER}/bin/
-else
-	VENV_FOLDER?=
-	ifneq ("${VENV_FOLDER}", "")
-		PYBIN=${VENV_FOLDER}/bin/
-		PYTHON=${PYBIN}python
-	else
-		PYBIN=
-	endif
+# Check if given Python is installed
+ifeq (,$(shell which $(PYTHON_BIN)))
+$(error "PYTHON=$(PYTHON_BIN) not found in $(PATH)")
 endif
 
-# installed?
-ifeq (, $(shell which $(PYTHON) ))
-  $(error "PYTHON=$(PYTHON) not found in $(PATH)")
+# Check if given Python version is ok
+PYTHON_VERSION_OK=$(shell $(PYTHON_BIN) -c "import sys; print((int(sys.version_info[0]), int(sys.version_info[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))))")
+ifeq ($(PYTHON_VERSION_OK),0)
+$(error "Need Python >= $(PYTHON_MIN_VERSION)")
 endif
 
-# version ok?
-PYTHON_VERSION_MIN=3.7
-PYTHON_VERSION_OK=$(shell $(PYTHON) -c 'import sys; print(int(sys.version_info[0:2] >= tuple(map(int, "$(PYTHON_VERSION_MIN)".split(".")))))' )
+# Check if venv folder is configured if venv is enabled
+ifeq ($(shell [[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] && echo "true"),"true")
+$(error "VENV_FOLDER must be configured if VENV_ENABLED is true")
+endif
 
-ifeq ($(PYTHON_VERSION_OK),0)
-  $(error "Need python $(PYTHON_VERSION) >= $(PYTHON_VERSION_MIN)")
+# determine the executable path
+ifeq ("$(VENV_ENABLED)", "true")
+MXENV_PATH=$(VENV_FOLDER)/bin/
+else
+MXENV_PATH=
 endif
 
-VENV_SENTINEL=${SENTINELFOLDER}venv.sentinel
-${VENV_SENTINEL}: ${SENTINEL}
-ifeq ("${VENV}", "on")
-	@echo "$(OK_COLOR)Setup Python Virtual Environment under '${VENV_FOLDER}' $(NO_COLOR)"
-	@${PYTHON} -m venv ${VENV_FOLDER}
+MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
+$(MXENV_TARGET): $(SENTINEL)
+ifeq ("$(VENV_ENABLED)", "true")
+	@echo "Setup Python Virtual Environment under '$(VENV_FOLDER)'"
+	@$(PYTHON_BIN) -m venv $(VENV_FOLDER)
+endif
+	@$(MXENV_PATH)pip install -U pip setuptools wheel
+	@$(MXENV_PATH)pip install -U $(MXDEV)
+	@$(MXENV_PATH)pip install -U $(MXMAKE)
+	@touch $(MXENV_TARGET)
+
+.PHONY: mxenv
+mxenv: $(MXENV_TARGET)
+
+.PHONY: mxenv-dirty
+mxenv-dirty:
+	@rm -f $(MXENV_TARGET)
+
+.PHONY: mxenv-clean
+mxenv-clean: mxenv-dirty
+ifeq ("$(VENV_ENABLED)", "true")
+	@rm -rf $(VENV_FOLDER)
 else
-	@echo "$(OK_COLOR)Use current local or global Python: `which ${PYTHON}` $(NO_COLOR)"
+	@$(MXENV_PATH)pip uninstall -y $(MXDEV)
+	@$(MXENV_PATH)pip uninstall -y $(MXMAKE)
 endif
-	@touch ${VENV_SENTINEL}
 
-PIP_SENTINEL=${SENTINELFOLDER}pip.sentinel
-${PIP_SENTINEL}: ${VENV_SENTINEL} ${CONSTRAINTS} ${SENTINEL}
-	@echo "$(OK_COLOR)Install pip$(NO_COLOR)"
-	@${PYBIN}pip install -U "pip>=22.0.2" wheel setuptools
-	@touch ${PIP_SENTINEL}
+INSTALL_TARGETS+=mxenv
+DIRTY_TARGETS+=mxenv-dirty
+CLEAN_TARGETS+=mxenv-clean
 
 ##############################################################################
-# MXDEV
+# mxfiles
+##############################################################################
 
-MXDEV_SENTINEL=${SENTINELFOLDER}pip-mxdev.sentinel
-${MXDEV_SENTINEL}: ${PIP_SENTINEL}
-	@echo "$(OK_COLOR)Install mxdev$(NO_COLOR)"
-	@${PYBIN}pip install "mxdev==2.1.0" "libvcs==0.11.1"
-	@touch ${MXDEV_SENTINEL}
+# File generation target
+MXMAKE_FILES?=$(MXMAKE_FOLDER)/files
 
-.PHONY: prepare
-prepare: ${PREPARE_TARGET} ## prepare soures and dependencies
+# set environment variables for mxmake
+define set_mxfiles_env
+	@export MXMAKE_MXENV_PATH=$(1)
+	@export MXMAKE_FILES=$(2)
+endef
 
-${PREPARE_PREREQUISITES}:
-	@touch $@
+# unset environment variables for mxmake
+define unset_mxfiles_env
+	@unset MXMAKE_MXENV_PATH
+	@unset MXMAKE_FILES
+endef
 
-${PREPARE_TARGET}: ${MXDEV_SENTINEL} ${PREPARE_PREREQUISITES}
-	@echo "$(OK_COLOR)Prepare sources and dependencies$(NO_COLOR)"
-	@${PYBIN}mxdev -c mx.ini
+$(PROJECT_CONFIG):
+ifneq ("$(wildcard $(PROJECT_CONFIG))","")
+	@touch $(PROJECT_CONFIG)
+else
+	@echo "[settings]" > $(PROJECT_CONFIG)
+endif
 
-.PHONY: install
-install: ${INSTALL_TARGET} ## pip install all dependencies and scripts
+LOCAL_PACKAGE_FILES:=
+ifneq ("$(wildcard pyproject.toml)","")
+	LOCAL_PACKAGE_FILES+=pyproject.toml
+endif
+ifneq ("$(wildcard setup.cfg)","")
+	LOCAL_PACKAGE_FILES+=setup.cfg
+endif
+ifneq ("$(wildcard setup.py)","")
+	LOCAL_PACKAGE_FILES+=setup.py
+endif
+
+FILES_TARGET:=requirements-mxdev.txt
+$(FILES_TARGET): $(PROJECT_CONFIG) $(MXENV_TARGET) $(LOCAL_PACKAGE_FILES)
+	@echo "Create project files"
+	@mkdir -p $(MXMAKE_FILES)
+	$(call set_mxfiles_env,$(MXENV_PATH),$(MXMAKE_FILES))
+	@$(MXENV_PATH)mxdev -n -c $(PROJECT_CONFIG)
+	$(call unset_mxfiles_env,$(MXENV_PATH),$(MXMAKE_FILES))
+	@touch $(FILES_TARGET)
 
-${INSTALL_TARGET}: ${PREPARE_TARGET}
-	@echo "$(OK_COLOR)Install dependencies and scripts$(NO_COLOR)"
-	@${PYBIN}pip install -r ${PREPARE_TARGET} ${PIP_PARAMS}
-	@${PYBIN}pip freeze >${INSTALL_TARGET}
+.PHONY: mxfiles
+mxfiles: $(FILES_TARGET)
+
+.PHONY: mxfiles-dirty
+mxfiles-dirty:
+	@touch $(PROJECT_CONFIG)
+
+.PHONY: mxfiles-clean
+mxfiles-clean: mxfiles-dirty
+	@rm -rf constraints-mxdev.txt requirements-mxdev.txt $(MXMAKE_FILES)
+
+INSTALL_TARGETS+=mxfiles
+DIRTY_TARGETS+=mxfiles-dirty
+CLEAN_TARGETS+=mxfiles-clean
 
 ##############################################################################
-# INSTANCE
+# sources
+##############################################################################
 
-COOKIECUTTER_SENTINEL=${SENTINELFOLDER}pip-cookiecutter.sentinel
-${COOKIECUTTER_SENTINEL}:
-	@echo "$(OK_COLOR)Install cookiecutter$(NO_COLOR)"
-	@${PYBIN}pip install "cookiecutter>=2.1.1"
-	@touch ${COOKIECUTTER_SENTINEL}
+SOURCES_TARGET:=$(SENTINEL_FOLDER)/sources.sentinel
+$(SOURCES_TARGET): $(FILES_TARGET)
+	@echo "Checkout project sources"
+	@$(MXENV_PATH)mxdev -o -c $(PROJECT_CONFIG)
+	@touch $(SOURCES_TARGET)
 
-${INSTANCE_YAML}:
-	@touch ${INSTANCE_YAML}
+.PHONY: sources
+sources: $(SOURCES_TARGET)
 
-.PHONY: instance
-instance: ${INSTANCE_TARGET} ## create configuration for an zope (plone) instance
+.PHONY: sources-dirty
+sources-dirty:
+	@rm -f $(SOURCES_TARGET)
 
-${INSTANCE_TARGET}: ${INSTANCE_PREREQUISITES} ${COOKIECUTTER_SENTINEL} ${INSTANCE_YAML}
-	@echo "$(OK_COLOR)Create Plone/Zope configuration from ${INSTANCE_YAML} at ${INSTANCE_FOLDER}$(NO_COLOR)"
-	@${PYBIN}cookiecutter -f --no-input --config-file ${INSTANCE_YAML} https://github.com/plone/cookiecutter-zope-instance
+.PHONY: sources-purge
+sources-purge: sources-dirty
+	@rm -rf sources
 
+INSTALL_TARGETS+=sources
+DIRTY_TARGETS+=sources-dirty
+PURGE_TARGETS+=sources-purge
 
 ##############################################################################
-# TESTING
+# packages
+##############################################################################
 
-TESTRUNNER_SENTINEL=${SENTINELFOLDER}pip-testrunner.sentinel
-${TESTRUNNER_SENTINEL}: ${PIP_SENTINEL}
-	@echo "$(OK_COLOR)Install zope.testrunner$(NO_COLOR)"
-	@${PYBIN}pip install zope.testrunner
-	@touch ${TESTRUNNER_SENTINEL}
+# case `core.sources` domain not included
+SOURCES_TARGET?=
 
-.PHONY: test
-test: ${TEST_PREREQUISITES} ${TESTRUNNER_SENTINEL} ## run tests
-	@echo "$(OK_COLOR)Run addon tests$(NO_COLOR)"
-	@${PYBIN}zope-testrunner --auto-color --auto-progress --test-path=${ADDONFOLDER}
+# additional sources targets which requires package re-install on change
+-include $(MXMAKE_FILES)/additional_sources_targets.mk
+ADDITIONAL_SOURCES_TARGETS?=
 
-.PHONY: test-ignore-warnings
-test-ignore-warnings: ${TEST_PREREQUISITES} ${TESTRUNNER_SENTINEL}  ## run tests (hide warnings)
-	@echo "$(OK_COLOR)Run addon tests$(NO_COLOR)"
-	@PYTHONWARNINGS=ignore ${PYBIN}zope-testrunner --auto-color --auto-progress --test-path=${ADDONFOLDER}
+INSTALLED_PACKAGES=$(MXMAKE_FILES)/installed.txt
+
+PACKAGES_TARGET:=$(INSTALLED_PACKAGES)
+$(PACKAGES_TARGET): $(FILES_TARGET) $(SOURCES_TARGET) $(ADDITIONAL_SOURCES_TARGETS)
+	@echo "Install python packages"
+	@$(MXENV_PATH)pip install -r $(FILES_TARGET)
+	@$(MXENV_PATH)pip freeze > $(INSTALLED_PACKAGES)
+	@touch $(PACKAGES_TARGET)
+
+.PHONY: packages
+packages: $(PACKAGES_TARGET)
+
+.PHONY: packages-dirty
+packages-dirty:
+	@rm -f $(PACKAGES_TARGET)
+
+.PHONY: packages-clean
+packages-clean:
+	@test -e $(FILES_TARGET) && pip uninstall -y -r $(FILES_TARGET)
+	@rm -f $(PACKAGES_TARGET)
+
+INSTALL_TARGETS+=packages
+DIRTY_TARGETS+=packages-dirty
+CLEAN_TARGETS+=packages-clean
 
 ##############################################################################
-# CODE FORMATTING
-
-BLACK_SENTINEL=${SENTINELFOLDER}pip-black.sentinel
-${BLACK_SENTINEL}: ${PREPARE_TARGET}
-	@echo "$(OK_COLOR)Install black$(NO_COLOR)"
-	@${PYBIN}pip install black
-	@touch ${BLACK_SENTINEL}
-
-ISORT_SENTINEL=${SENTINELFOLDER}pip-isort.sentinel
-${ISORT_SENTINEL}: ${PREPARE_TARGET}
-	@echo "$(OK_COLOR)Install isort$(NO_COLOR)"
-	@${PYBIN}pip install isort
-	@touch ${ISORT_SENTINEL}
-
-ZPRETTY_SENTINEL=${SENTINELFOLDER}pip-zpretty.sentinel
-${ZPRETTY_SENTINEL}: ${PREPARE_TARGET}
-	@echo "$(OK_COLOR)Install zpretty$(NO_COLOR)"
-	@${PYBIN}pip install "zpretty>=2.2.0"
-	@touch ${ZPRETTY_SENTINEL}
-
-.PHONY: apply-style-black
-apply-style-black: ${BLACK_SENTINEL}  ## apply/format code style black (to Python files)
-	@echo "$(OK_COLOR)Apply style black rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
-	@${PYBIN}black ${ADDONFOLDER}
-
-.PHONY: apply-style-isort
-apply-style-isort: ${ISORT_SENTINEL} ## apply/format code style isort (sorted imports in Python files)
-	@echo "$(OK_COLOR)Apply style isort rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
-	@${PYBIN}isort ${ADDONFOLDER}
-
-.PHONY: apply-style-zpretty
-apply-style-zpretty: ${ZPRETTY_SENTINEL}   ## apply/format code style zpretty (to XML/ZCML files)
-	@echo "$(OK_COLOR)Apply style zpretty rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
-	@find ${ADDONFOLDER} -name '*.zcml' -exec ${PYBIN}zpretty -iz {} +
-	@find ${ADDONFOLDER} -name "*.xml"|grep -v locales|xargs ${PYBIN}zpretty -ix
-
-.PHONY: style ## apply code styles black, isort and zpretty
-style: apply-style-black apply-style-isort
-
-.PHONY: format ## alias for "style"
-FORMATTING: style
-
-.PHONY: lint-black
-lint-black: ${BLACK_SENTINEL}  ## lint code-style black (to Python files)
-	@echo "$(OK_COLOR)Lint black rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
-	@${PYBIN}black --check ${ADDONFOLDER}
-
-.PHONY: lint-isort
-lint-isort: ${ISORT_SENTINEL} ## lint code-style isort (sorted imports in Python files)
-	@echo "$(OK_COLOR)Lint style isort rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
-	@${PYBIN}isort --check-only ${ADDONFOLDER}
-
-.PHONY: lint-zpretty
-lint-zpretty: ${ZPRETTY_SENTINEL}   ## lint code-style zpretty (to XML/ZCML files)
-	@echo "$(OK_COLOR)Lint style zpretty rules to code in ${ADDONFOLDER}/*$(NO_COLOR)"
-	@find ${ADDONFOLDER} -name '*.zcml' -exec ${PYBIN}zpretty --check -z {} +
-	@find ${ADDONFOLDER} -name '*.xml'|grep -v locales|xargs ${PYBIN}zpretty --check -x
-
-.PHONY: lint ## lint all: check if complies with code-styles black, isort and zpretty
-lint: lint-black lint-isort
+# cookiecutter
+##############################################################################
+
+COOKIECUTTER_TARGET:=$(SENTINEL_FOLDER)/cookiecutter.sentinel
+$(COOKIECUTTER_TARGET): $(MXENV_TARGET)
+	@echo "Install cookiecutter"
+	@$(MXENV_PATH)pip install "cookiecutter>=2.1.1"
+	@touch $(COOKIECUTTER_TARGET)
+
+.PHONY: cookiecutter-dirty
+cookiecutter-dirty:
+	@rm -f $(COOKIECUTTER_TARGET)
+
+.PHONY: cookiecutter-clean
+cookiecutter-clean: cookiecutter-dirty
+	@rm -f $(COOKIECUTTER_TARGET)
+	@$(MXENV_PATH)pip uninstall cookiecutter
 
+DIRTY_TARGETS+=cookiecutter-dirty
+CLEAN_TARGETS+=cookiecutter-clean
 ##############################################################################
-# RUN
+# zope
+##############################################################################
+
+ZOPE_INSTANCE_FOLDER:=$(ZOPE_BASE_FOLDER)/instance
+ZOPE_INSTANCE_TARGET:=$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini $(ZOPE_INSTANCE_FOLDER)/etc/zope.conf $(ZOPE_INSTANCE_FOLDER)/etc/site.zcml
+
+${ZOPE_CONFIGURATION_FILE}:
+	@touch ${ZOPE_CONFIGURATION_FILE}
+
+$(ZOPE_INSTANCE_TARGET): $(COOKIECUTTER_TARGET) $(ZOPE_CONFIGURATION_FILE)
+	@echo Create Plone/Zope configuration from $(ZOPE_TEMPLATE) to $(ZOPE_INSTANCE_FOLDER)
+	@$(MXENV_PATH)cookiecutter -f --no-input --config-file $(ZOPE_CONFIGURATION_FILE) --output-dir $(ZOPE_BASE_FOLDER) $(ZOPE_TEMPLATE)
+
+.PHONY: zope-instance
+zope-instance: $(ZOPE_INSTANCE_TARGET) $(SOURCES)
+
+.PHONY: zope-start
+zope-start: $(ZOPE_INSTANCE_TARGET) $(PACKAGES_TARGET)
+	@echo "Start Zope/Plone with configuration in $(ZOPE_INSTANCE_FOLDER)"
+	@$(MXENV_PATH)runwsgi -v "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini"
+
+.PHONY: zope-debug
+zope-debug: $(ZOPE_INSTANCE_TARGET) $(PACKAGES_TARGET)
+	@echo "Start Zope/Plone with configuration in $(ZOPE_INSTANCE_FOLDER)"
+	@$(MXENV_PATH)zconsole debug "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini"
+
+.PHONY: zope-runscript
+zope-runscript: $(ZOPE_INSTANCE_TARGET) $(PACKAGES_TARGET)
+	@echo "Run Zope/Plone Console Script $(ZOPE_SCRIPTNAME) in $(ZOPE_INSTANCE_FOLDER)"
+	@$(MXENV_PATH)zconsole run "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini" $(ZOPE_SCRIPTNAME)
+
+.PHONY: zope-dirty
+zope-dirty:
+	@touch ${ZOPE_CONFIGURATION_FILE}
 
-.PHONY: run
-run: ${RUN_PREREQUISITES} ## run/start Plone
-	@echo "$(OK_COLOR)Run Plone$(NO_COLOR)"
-	@${PYBIN}runwsgi -v instance/etc/zope.ini
+.PHONY: zope-clean
+zope-clean:
+	@touch ${ZOPE_CONFIGURATION_FILE}
+	@rm -rf $(ZOPE_INSTANCE_FOLDER)/etc $(ZOPE_INSTANCE_FOLDER)/inituser
+
+.PHONY: zope-purge
+zope-purge: zope-dirty
+	@rm -rf $(ZOPE_INSTANCE_FOLDER)
+
+INSTALL_TARGETS+=zope-instance
+DIRTY_TARGETS+=zope-dirty
+CLEAN_TARGETS+=zope-clean
 
 ##############################################################################
-# CLEAN
-.PHONY: clean-venv
-clean-venv: ## remove Python virtual environment
-ifeq ("${VENV}", "on")
-	@echo "$(OK_COLOR)Remove Virtualenv.$(NO_COLOR)"
-	rm -rf ${VENV_FOLDER} ${SENTINELFOLDER}/pip*.sentinel ${VENV_SENTINEL}
-else:
-	@echo "$(OK_WARN)No self-created Python virtualenv at '${VENV_FOLDER}'! Nothing to do.$(NO_COLOR)"
-endif
+# Default targets
+##############################################################################
 
-.PHONY: clean-pyc
-clean-pyc: ## remove Python file artifacts
-	@echo "$(OK_COLOR)Remove Python file artifacts (like byte-code) of code in current directory.$(NO_COLOR)"
-	find . -name '*.pyc' -exec rm -f {} +
-	find . -name '*.pyo' -exec rm -f {} +
-	find . -name '*~' -exec rm -f {} +
-	find . -name '__pycache__' -exec rm -fr {} +
+INSTALL_TARGET:=$(SENTINEL_FOLDER)/install.sentinel
+$(INSTALL_TARGET): $(INSTALL_TARGETS)
+	@touch $(INSTALL_TARGET)
 
-.PHONY: clean-make
-clean-make:  ## remove make artifact	@echo "$(OK_COLOR)Remove Plone/Zope configuration (keeps data) and sentinel files.$(NO_COLOR)"
-	rm -rf ${INSTALL_PREREQUSISTES} ${INSTANCE_TARGET} ${SENTINELFOLDER} constraints-mxdev.txt
+.PHONY: install
+install: $(INSTALL_TARGET)
+	@touch $(INSTALL_TARGET)
 
-.PHONY: clean-instance
-clean-instance:  ## remove instance configuration (keeps data)
-	@echo "$(OK_COLOR)Remove Plone/Zope configuration (keeps data) and sentinel files.$(NO_COLOR)"
-	rm -f ${INSTANCE_TARGET}
+.PHONY: deploy
+deploy: $(DEPLOY_TARGETS)
+
+.PHONY: dirty
+dirty: $(DIRTY_TARGETS)
+	@rm -f $(INSTALL_TARGET)
 
 .PHONY: clean
-clean:  clean-venv clean-pyc clean-make clean-instance   ## clean all (except local database and pip installed packages)
+clean: dirty $(CLEAN_TARGETS)
+	@rm -rf $(CLEAN_TARGETS) $(MXMAKE_FOLDER) $(CLEAN_FS)
+
+.PHONY: purge
+purge: clean $(PURGE_TARGETS)
+
+.PHONY: runtime-clean
+runtime-clean:
+	@echo "Remove runtime artifacts, like byte-code and caches."
+	@find . -name '*.py[c|o]' -delete
+	@find . -name '*~' -exec rm -f {} +
+	@find . -name '__pycache__' -exec rm -fr {} +
+
diff --git a/mx.ini b/mx.ini
index 485125d8..12f297ec 100644
--- a/mx.ini
+++ b/mx.ini
@@ -14,7 +14,6 @@ requirements-out = requirements-mxdev.txt
 ignores =
     bda.plone.shop
 
-
 # default-install-mode = direct
 
 # variables

From 63a7311d3afaba59c67d10b0fc17201525f26357 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Tue, 7 Feb 2023 10:52:59 +0100
Subject: [PATCH 51/74] Update makefile

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f1f31cc0..df9d5631 100644
--- a/Makefile
+++ b/Makefile
@@ -285,7 +285,9 @@ packages-dirty:
 
 .PHONY: packages-clean
 packages-clean:
-	@test -e $(FILES_TARGET) && pip uninstall -y -r $(FILES_TARGET)
+	@test -e $(FILES_TARGET) \
+		&& test -e $(MXENV_PATH)pip \
+		&& $(MXENV_PATH)pip uninstall -y -r $(FILES_TARGET)
 	@rm -f $(PACKAGES_TARGET)
 
 INSTALL_TARGETS+=packages
@@ -308,11 +310,12 @@ cookiecutter-dirty:
 
 .PHONY: cookiecutter-clean
 cookiecutter-clean: cookiecutter-dirty
+	@test -e $(MXENV_PATH)pip && $(MXENV_PATH)pip uninstall -y cookiecutter
 	@rm -f $(COOKIECUTTER_TARGET)
-	@$(MXENV_PATH)pip uninstall cookiecutter
 
 DIRTY_TARGETS+=cookiecutter-dirty
 CLEAN_TARGETS+=cookiecutter-clean
+
 ##############################################################################
 # zope
 ##############################################################################

From 26adb78438a6e69d30f818eff8970be78ef671af Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Tue, 7 Feb 2023 11:40:37 +0100
Subject: [PATCH 52/74] Update makefile and mx.ini

---
 Makefile | 60 ++++++++++++++++++++++++++++----------------------------
 mx.ini   | 38 +++++++++++++++++++++++------------
 2 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/Makefile b/Makefile
index df9d5631..70c8e4f1 100644
--- a/Makefile
+++ b/Makefile
@@ -170,10 +170,38 @@ INSTALL_TARGETS+=mxenv
 DIRTY_TARGETS+=mxenv-dirty
 CLEAN_TARGETS+=mxenv-clean
 
+##############################################################################
+# sources
+##############################################################################
+
+SOURCES_TARGET:=$(SENTINEL_FOLDER)/sources.sentinel
+$(SOURCES_TARGET): $(MXENV_TARGET)
+	@echo "Checkout project sources"
+	@$(MXENV_PATH)mxdev -o -c $(PROJECT_CONFIG)
+	@touch $(SOURCES_TARGET)
+
+.PHONY: sources
+sources: $(SOURCES_TARGET)
+
+.PHONY: sources-dirty
+sources-dirty:
+	@rm -f $(SOURCES_TARGET)
+
+.PHONY: sources-purge
+sources-purge: sources-dirty
+	@rm -rf sources
+
+INSTALL_TARGETS+=sources
+DIRTY_TARGETS+=sources-dirty
+PURGE_TARGETS+=sources-purge
+
 ##############################################################################
 # mxfiles
 ##############################################################################
 
+# case `core.sources` domain not included
+SOURCES_TARGET?=
+
 # File generation target
 MXMAKE_FILES?=$(MXMAKE_FOLDER)/files
 
@@ -208,7 +236,7 @@ ifneq ("$(wildcard setup.py)","")
 endif
 
 FILES_TARGET:=requirements-mxdev.txt
-$(FILES_TARGET): $(PROJECT_CONFIG) $(MXENV_TARGET) $(LOCAL_PACKAGE_FILES)
+$(FILES_TARGET): $(PROJECT_CONFIG) $(MXENV_TARGET) $(SOURCES_TARGET) $(LOCAL_PACKAGE_FILES)
 	@echo "Create project files"
 	@mkdir -p $(MXMAKE_FILES)
 	$(call set_mxfiles_env,$(MXENV_PATH),$(MXMAKE_FILES))
@@ -231,38 +259,10 @@ INSTALL_TARGETS+=mxfiles
 DIRTY_TARGETS+=mxfiles-dirty
 CLEAN_TARGETS+=mxfiles-clean
 
-##############################################################################
-# sources
-##############################################################################
-
-SOURCES_TARGET:=$(SENTINEL_FOLDER)/sources.sentinel
-$(SOURCES_TARGET): $(FILES_TARGET)
-	@echo "Checkout project sources"
-	@$(MXENV_PATH)mxdev -o -c $(PROJECT_CONFIG)
-	@touch $(SOURCES_TARGET)
-
-.PHONY: sources
-sources: $(SOURCES_TARGET)
-
-.PHONY: sources-dirty
-sources-dirty:
-	@rm -f $(SOURCES_TARGET)
-
-.PHONY: sources-purge
-sources-purge: sources-dirty
-	@rm -rf sources
-
-INSTALL_TARGETS+=sources
-DIRTY_TARGETS+=sources-dirty
-PURGE_TARGETS+=sources-purge
-
 ##############################################################################
 # packages
 ##############################################################################
 
-# case `core.sources` domain not included
-SOURCES_TARGET?=
-
 # additional sources targets which requires package re-install on change
 -include $(MXMAKE_FILES)/additional_sources_targets.mk
 ADDITIONAL_SOURCES_TARGETS?=
@@ -270,7 +270,7 @@ ADDITIONAL_SOURCES_TARGETS?=
 INSTALLED_PACKAGES=$(MXMAKE_FILES)/installed.txt
 
 PACKAGES_TARGET:=$(INSTALLED_PACKAGES)
-$(PACKAGES_TARGET): $(FILES_TARGET) $(SOURCES_TARGET) $(ADDITIONAL_SOURCES_TARGETS)
+$(PACKAGES_TARGET): $(FILES_TARGET) $(ADDITIONAL_SOURCES_TARGETS)
 	@echo "Install python packages"
 	@$(MXENV_PATH)pip install -r $(FILES_TARGET)
 	@$(MXENV_PATH)pip freeze > $(INSTALLED_PACKAGES)
diff --git a/mx.ini b/mx.ini
index 12f297ec..05b5b638 100644
--- a/mx.ini
+++ b/mx.ini
@@ -17,47 +17,59 @@ ignores =
 # default-install-mode = direct
 
 # variables
-; github = git+ssh://git@github.com
-github = git+https://github.com
-conestack = git@github.com:conestack
+bda = https://github.com/bluedynamics
+bda_push = git@github.com:bluedynamics
+cs = https://github.com/conestack
+cs_push = git@github.com:conestack
+
 [bda.plone.cart]
-url = ${settings:github}/bluedynamics/bda.plone.cart.git
+url = ${settings:bda}/bda.plone.cart.git
+pushurl = ${settings:bda_push}/bda.plone.cart.git
 branch = bootstrap-plone6
 
 [bda.plone.checkout]
-url = ${settings:github}/bluedynamics/bda.plone.checkout.git
+url = ${settings:bda}/bda.plone.checkout.git
+pushurl = ${settings:bda_push}/bda.plone.checkout.git
 branch = bootstrap-plone6
 
 [bda.plone.discount]
-url = ${settings:github}/bluedynamics/bda.plone.discount.git
+url = ${settings:bda}/bda.plone.discount.git
+pushurl = ${settings:bda_push}/bda.plone.discount.git
 branch = bootstrap-plone6
 
 [bda.plone.payment]
-url = ${settings:github}/bluedynamics/bda.plone.payment.git
+url = ${settings:bda}/bda.plone.payment.git
+pushurl = ${settings:bda_push}/bda.plone.payment.git
 branch = bootstrap-plone6
 
 [bda.plone.orders]
-url = ${settings:github}/bluedynamics/bda.plone.orders.git
+url = ${settings:bda}/bda.plone.orders.git
+pushurl = ${settings:bda_push}/bda.plone.orders.git
 branch = bootstrap-plone6
 
 # [bda.plone.stripe]
-# url = ${settings:github}/bluedynamics/bda.plone.stripe.git
+# url = ${settings:bda}/bda.plone.stripe.git
+# pushurl = ${settings:bda_push}/bda.plone.stripe.git
 # branch = main
 # install-mode = skip
 
 # [bda.plone.wallee]
-# url = ${settings:github}/bluedynamics/bda.plone.wallee.git
+# url = ${settings:bda}/bda.plone.wallee.git
+# pushurl = ${settings:bda_push}/bda.plone.wallee.git
 # branch = main
 # install-mode = skip
 
 [yafowil.plone]
-url = ${settings:github}/bluedynamics/yafowil.plone.git
+url = ${settings:bda}/yafowil.plone.git
+pushurl = ${settings:bda_push}/yafowil.plone.git
 branch = bootstrap-plone6
 
 [yafowil.bootstrap]
-url = ${settings:conestack}/yafowil.bootstrap.git
+url = ${settings:cs}/yafowil.bootstrap.git
+pushurl = ${settings:cs_push}/yafowil.bootstrap.git
 branch = 2.0
 
 [yafowil]
-url = ${settings:conestack}/yafowil.git
+url = ${settings:cs}/yafowil.git
+pushurl = ${settings:cs_push}/yafowil.git
 branch = master

From ac1c9d0d2f4b864e1bf038b9911efa4d6129dd7a Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Tue, 7 Feb 2023 12:02:27 +0100
Subject: [PATCH 53/74] Update makefile

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 70c8e4f1..39a7cb95 100644
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,8 @@ packages-dirty:
 packages-clean:
 	@test -e $(FILES_TARGET) \
 		&& test -e $(MXENV_PATH)pip \
-		&& $(MXENV_PATH)pip uninstall -y -r $(FILES_TARGET)
+		&& $(MXENV_PATH)pip uninstall -y -r $(FILES_TARGET) \
+		|| :
 	@rm -f $(PACKAGES_TARGET)
 
 INSTALL_TARGETS+=packages
@@ -310,7 +311,7 @@ cookiecutter-dirty:
 
 .PHONY: cookiecutter-clean
 cookiecutter-clean: cookiecutter-dirty
-	@test -e $(MXENV_PATH)pip && $(MXENV_PATH)pip uninstall -y cookiecutter
+	@test -e $(MXENV_PATH)pip && $(MXENV_PATH)pip uninstall -y cookiecutter || :
 	@rm -f $(COOKIECUTTER_TARGET)
 
 DIRTY_TARGETS+=cookiecutter-dirty

From f545f0fca52c374b8ee865bc309417594a9b4f90 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Wed, 8 Feb 2023 11:49:47 +0100
Subject: [PATCH 54/74] Add shop.tac to be able to start zope with twisted.

---
 shop.tac | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 shop.tac

diff --git a/shop.tac b/shop.tac
new file mode 100644
index 00000000..9ccc1daf
--- /dev/null
+++ b/shop.tac
@@ -0,0 +1,35 @@
+##############################################################################
+# Start zope with twisted WSGI server
+#
+# Install required python packages with pip:
+#
+#     ./venv/bin/pip install twisted plaster plaster_pastedeploy
+#
+# Start zope:
+#
+#     ./venv/bin/twistd -ny shop.tac
+##############################################################################
+
+from twisted.application import internet
+from twisted.application import service
+from twisted.internet import reactor
+from twisted.web.server import Site
+from twisted.web.wsgi import WSGIResource
+import os
+import plaster
+
+config='./instance/etc/zope.ini'
+config = os.path.abspath(config)
+port = 8081
+
+# Get the WSGI application
+loader = plaster.get_loader(config, protocols=['wsgi'])
+app = loader.get_wsgi_app('main')
+
+# Twisted WSGI server setup
+resource = WSGIResource(reactor, reactor.getThreadPool(), app)
+factory = Site(resource)
+
+# Twisted Application setup
+application = service.Application('zope')
+internet.TCPServer(port, factory).setServiceParent(application)

From b9bcf4cc35d29b2ac9d69631b441c5d71868e650 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Wed, 8 Feb 2023 11:59:26 +0100
Subject: [PATCH 55/74] use asyncio main loop in twisted

---
 shop.tac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shop.tac b/shop.tac
index 9ccc1daf..dcf64e6b 100644
--- a/shop.tac
+++ b/shop.tac
@@ -10,6 +10,10 @@
 #     ./venv/bin/twistd -ny shop.tac
 ##############################################################################
 
+# use asyncio main loop in twisted
+from twisted.internet import asyncioreactor
+asyncioreactor.install()
+
 from twisted.application import internet
 from twisted.application import service
 from twisted.internet import reactor

From 298429b25b4b2242cb11eb4a4ecb9e8cf394fb2a Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Thu, 16 Mar 2023 09:37:22 +0100
Subject: [PATCH 56/74] catch error when looking up text in configuration. this
 is needed with the newest `datagridfield` updates.

---
 src/bda/plone/shop/mailnotify.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/mailnotify.py b/src/bda/plone/shop/mailnotify.py
index f4349217..ad050910 100644
--- a/src/bda/plone/shop/mailnotify.py
+++ b/src/bda/plone/shop/mailnotify.py
@@ -86,7 +86,9 @@ def __init__(self, context):
 
     def _lookup_text(self, field):
         settings = get_shop_notification_settings()
-        enum = getattr(settings, field)
+        enum = getattr(settings, field, None)
+        if enum is None:
+            return
         portal_state = self.context.restrictedTraverse("@@plone_portal_state")
         lang = portal_state.language()
         for entry in enum:

From c30a16609cfbd0f2f2cdd1777451733bbce16312 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Sat, 13 Apr 2024 11:39:32 +0200
Subject: [PATCH 57/74] Update makefile

---
 .github/workflows/main.yml |   6 +-
 Makefile                   | 293 ++++++++++++++++++++++++++++++-------
 mx.ini                     |   3 +-
 requirements.txt           |   1 -
 4 files changed, 242 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca6bd130..1f135df2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,8 +33,4 @@ jobs:
 
       - name: Run Lint
         run: |
-          make lint
-
-      - name: Run tests
-        run: |
-          make test-ignore-warnings
+          make check
diff --git a/Makefile b/Makefile
index 39a7cb95..3a721155 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@
 #: core.mxfiles
 #: core.packages
 #: core.sources
+#: qa.isort
+#: qa.ruff
 #
 # SETTINGS (ALL CHANGES MADE BELOW SETTINGS WILL BE LOST)
 ##############################################################################
@@ -19,22 +21,52 @@
 # No default value.
 DEPLOY_TARGETS?=
 
+# target to be executed when calling `make run`
+# No default value.
+RUN_TARGET?=
+
 # Additional files and folders to remove when running clean target
 # No default value.
 CLEAN_FS?=
 
+# Optional makefile to include before default targets. This can
+# be used to provide custom targets or hook up to existing targets.
+# Default: include.mk
+INCLUDE_MAKEFILE?=include.mk
+
+# Optional additional directories to be added to PATH in format
+# `/path/to/dir/:/path/to/other/dir`. Gets inserted first, thus gets searched
+# first.
+# No default value.
+EXTRA_PATH?=
+
 ## core.mxenv
 
-# Python interpreter to use.
+# Primary Python interpreter to use. It is used to create the
+# virtual environment if `VENV_ENABLED` and `VENV_CREATE` are set to `true`.
 # Default: python3
-PYTHON_BIN?=python3
+PRIMARY_PYTHON?=python3
 
 # Minimum required Python version.
 # Default: 3.7
 PYTHON_MIN_VERSION?=3.7
 
-# Flag whether to use virtual environment.
-# If `false`, the interpreter according to `PYTHON_BIN` found in `PATH` is used.
+# Install packages using the given package installer method.
+# Supported are `pip` and `uv`. If uv is used, its global availability is
+# checked. Otherwise, it is installed, either in the virtual environment or
+# using the `PRIMARY_PYTHON`, dependent on the `VENV_ENABLED` setting. If
+# `VENV_ENABLED` and uv is selected, uv is used to create the virtual
+# environment.
+# Default: pip
+PYTHON_PACKAGE_INSTALLER?=uv
+
+# Flag whether to use a global installed 'uv' or install
+# it in the virtual environment.
+# Default: false
+MXENV_UV_GLOBAL?=false
+
+# Flag whether to use virtual environment. If `false`, the
+# interpreter according to `PRIMARY_PYTHON` found in `PATH` is used.
 # Default: true
 VENV_ENABLED?=true
 
@@ -45,19 +77,32 @@ VENV_ENABLED?=true
 VENV_CREATE?=true
 
 # The folder of the virtual environment.
-# If `VENV_ENABLED` is `true` and `VENV_CREATE` is true it is used as the target folder for the virtual environment.
-# If `VENV_ENABLED` is `true` and `VENV_CREATE` is false it is expected to point to an existing virtual environment.
-# If `VENV_ENABLED` is `false` it is ignored.
-# Default: venv
+# If `VENV_ENABLED` is `true` and `VENV_CREATE` is true it is used as the
+# target folder for the virtual environment. If `VENV_ENABLED` is `true` and
+# `VENV_CREATE` is false it is expected to point to an existing virtual
+# environment. If `VENV_ENABLED` is `false` it is ignored.
+# Default: .venv
 VENV_FOLDER?=venv
 
 # mxdev to install in virtual environment.
-# Default: https://github.com/mxstack/mxdev/archive/main.zip
-MXDEV?=https://github.com/mxstack/mxdev/archive/main.zip
+# Default: mxdev
+MXDEV?=mxdev
 
 # mxmake to install in virtual environment.
-# Default: https://github.com/mxstack/mxmake/archive/develop.zip
-MXMAKE?=https://github.com/mxstack/mxmake/archive/develop.zip
+# Default: mxmake
+MXMAKE?=mxmake
+
+## qa.ruff
+
+# Source folder to scan for Python files to run ruff on.
+# Default: src
+RUFF_SRC?=src
+
+## qa.isort
+
+# Source folder to scan for Python files to run isort on.
+# Default: src
+ISORT_SRC?=src
 
 ## core.mxfiles
 
@@ -65,6 +110,13 @@ MXMAKE?=https://github.com/mxstack/mxmake/archive/develop.zip
 # Default: mx.ini
 PROJECT_CONFIG?=mx.ini
 
+## core.packages
+
+# Allow prerelease and development versions.
+# By default, the package installer only finds stable versions.
+# Default: false
+PACKAGES_ALLOW_PRERELEASES?=false
+
 ## applications.zope
 
 # cookiecutter configuration file to use
@@ -75,6 +127,10 @@ ZOPE_CONFIGURATION_FILE?=instance.yaml
 # Default: https://github.com/plone/cookiecutter-zope-instance
 ZOPE_TEMPLATE?=https://github.com/plone/cookiecutter-zope-instance
 
+# cookiecutter branch, tag or commit to checkout from the ZOPE_TEMPLATE. If empty, `--checkout` is not passed to cookiecutter.
+# Default: main
+ZOPE_TEMPLATE_CHECKOUT?=main
+
 # The Zope folder "instance" will be generated relative to this existing folder.
 # Default: .
 ZOPE_BASE_FOLDER?=.
@@ -91,6 +147,11 @@ INSTALL_TARGETS?=
 DIRTY_TARGETS?=
 CLEAN_TARGETS?=
 PURGE_TARGETS?=
+CHECK_TARGETS?=
+TYPECHECK_TARGETS?=
+FORMAT_TARGETS?=
+
+export PATH:=$(if $(EXTRA_PATH),$(EXTRA_PATH):,)$(PATH)
 
 # Defensive settings for make: https://tech.davis-hansson.com/p/make/
 SHELL:=bash
@@ -117,12 +178,12 @@ $(SENTINEL):
 ##############################################################################
 
 # Check if given Python is installed
-ifeq (,$(shell which $(PYTHON_BIN)))
-$(error "PYTHON=$(PYTHON_BIN) not found in $(PATH)")
+ifeq (,$(shell which $(PRIMARY_PYTHON)))
+$(error "PYTHON=$(PRIMARY_PYTHON) not found in $(PATH)")
 endif
 
 # Check if given Python version is ok
-PYTHON_VERSION_OK=$(shell $(PYTHON_BIN) -c "import sys; print((int(sys.version_info[0]), int(sys.version_info[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))))")
+PYTHON_VERSION_OK=$(shell $(PRIMARY_PYTHON) -c "import sys; print((int(sys.version_info[0]), int(sys.version_info[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))))")
 ifeq ($(PYTHON_VERSION_OK),0)
 $(error "Need Python >= $(PYTHON_MIN_VERSION)")
 endif
@@ -132,22 +193,55 @@ ifeq ($(shell [[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] && ech
 $(error "VENV_FOLDER must be configured if VENV_ENABLED is true")
 endif
 
-# determine the executable path
+# Check if global python is used with uv (this is not supported by uv)
+ifeq ("$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)","falseuv")
+$(error "Package installer uv does not work with a global Python interpreter.")
+endif
+
+# Determine the executable path
 ifeq ("$(VENV_ENABLED)", "true")
-MXENV_PATH=$(VENV_FOLDER)/bin/
+export VIRTUAL_ENV=$(abspath $(VENV_FOLDER))
+ifeq ("$(OS)", "Windows_NT")
+VENV_EXECUTABLE_FOLDER=$(VIRTUAL_ENV)/Scripts
+else
+VENV_EXECUTABLE_FOLDER=$(VIRTUAL_ENV)/bin
+endif
+export PATH:=$(VENV_EXECUTABLE_FOLDER):$(PATH)
+MXENV_PYTHON=python
 else
-MXENV_PATH=
+MXENV_PYTHON=$(PRIMARY_PYTHON)
+endif
+
+# Determine the package installer
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)","uv")
+PYTHON_PACKAGE_COMMAND=uv pip
+else
+PYTHON_PACKAGE_COMMAND=$(MXENV_PYTHON) -m pip
 endif
 
 MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
 $(MXENV_TARGET): $(SENTINEL)
 ifeq ("$(VENV_ENABLED)", "true")
-	@echo "Setup Python Virtual Environment under '$(VENV_FOLDER)'"
-	@$(PYTHON_BIN) -m venv $(VENV_FOLDER)
+ifeq ("$(VENV_CREATE)", "true")
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvtrue")
+	@echo "Setup Python Virtual Environment using package 'uv' at '$(VENV_FOLDER)'"
+	@uv venv -p $(PRIMARY_PYTHON) --seed $(VENV_FOLDER)
+else
+	@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
+	@$(PRIMARY_PYTHON) -m venv $(VENV_FOLDER)
+	@$(MXENV_PYTHON) -m ensurepip -U
 endif
-	@$(MXENV_PATH)pip install -U pip setuptools wheel
-	@$(MXENV_PATH)pip install -U $(MXDEV)
-	@$(MXENV_PATH)pip install -U $(MXMAKE)
+endif
+else
+	@echo "Using system Python interpreter"
+endif
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvfalse")
+	@echo "Install uv"
+	@$(MXENV_PYTHON) -m pip install uv
+endif
+	@$(PYTHON_PACKAGE_COMMAND) install -U pip setuptools wheel
+	@echo "Install/Update MXStack Python packages"
+	@$(PYTHON_PACKAGE_COMMAND) install -U $(MXDEV) $(MXMAKE)
 	@touch $(MXENV_TARGET)
 
 .PHONY: mxenv
@@ -160,24 +254,95 @@ mxenv-dirty:
 .PHONY: mxenv-clean
 mxenv-clean: mxenv-dirty
 ifeq ("$(VENV_ENABLED)", "true")
+ifeq ("$(VENV_CREATE)", "true")
 	@rm -rf $(VENV_FOLDER)
+endif
 else
-	@$(MXENV_PATH)pip uninstall -y $(MXDEV)
-	@$(MXENV_PATH)pip uninstall -y $(MXMAKE)
+	@$(PYTHON_PACKAGE_COMMAND) uninstall -y $(MXDEV)
+	@$(PYTHON_PACKAGE_COMMAND) uninstall -y $(MXMAKE)
 endif
 
 INSTALL_TARGETS+=mxenv
 DIRTY_TARGETS+=mxenv-dirty
 CLEAN_TARGETS+=mxenv-clean
 
+##############################################################################
+# ruff
+##############################################################################
+
+RUFF_TARGET:=$(SENTINEL_FOLDER)/ruff.sentinel
+$(RUFF_TARGET): $(MXENV_TARGET)
+	@echo "Install Ruff"
+	@$(PYTHON_PACKAGE_COMMAND) install ruff
+	@touch $(RUFF_TARGET)
+
+.PHONY: ruff-check
+ruff-check: $(RUFF_TARGET)
+	@echo "Run ruff check"
+	@ruff check $(RUFF_SRC)
+
+.PHONY: ruff-format
+ruff-format: $(RUFF_TARGET)
+	@echo "Run ruff format"
+	@ruff format $(RUFF_SRC)
+
+.PHONY: ruff-dirty
+ruff-dirty:
+	@rm -f $(RUFF_TARGET)
+
+.PHONY: ruff-clean
+ruff-clean: ruff-dirty
+	@test -e $(MXENV_PYTHON) && $(MXENV_PYTHON) -m pip uninstall -y ruff || :
+	@rm -rf .ruff_cache
+
+INSTALL_TARGETS+=$(RUFF_TARGET)
+CHECK_TARGETS+=ruff-check
+FORMAT_TARGETS+=ruff-format
+DIRTY_TARGETS+=ruff-dirty
+CLEAN_TARGETS+=ruff-clean
+
+##############################################################################
+# isort
+##############################################################################
+
+ISORT_TARGET:=$(SENTINEL_FOLDER)/isort.sentinel
+$(ISORT_TARGET): $(MXENV_TARGET)
+	@echo "Install isort"
+	@$(PYTHON_PACKAGE_COMMAND) install isort
+	@touch $(ISORT_TARGET)
+
+.PHONY: isort-check
+isort-check: $(ISORT_TARGET)
+	@echo "Run isort check"
+	@isort --check $(ISORT_SRC)
+
+.PHONY: isort-format
+isort-format: $(ISORT_TARGET)
+	@echo "Run isort format"
+	@isort $(ISORT_SRC)
+
+.PHONY: isort-dirty
+isort-dirty:
+	@rm -f $(ISORT_TARGET)
+
+.PHONY: isort-clean
+isort-clean: isort-dirty
+	@test -e $(MXENV_PYTHON) && $(MXENV_PYTHON) -m pip uninstall -y isort || :
+
+INSTALL_TARGETS+=$(ISORT_TARGET)
+CHECK_TARGETS+=isort-check
+FORMAT_TARGETS+=isort-format
+DIRTY_TARGETS+=isort-dirty
+CLEAN_TARGETS+=isort-clean
+
 ##############################################################################
 # sources
 ##############################################################################
 
 SOURCES_TARGET:=$(SENTINEL_FOLDER)/sources.sentinel
-$(SOURCES_TARGET): $(MXENV_TARGET)
+$(SOURCES_TARGET): $(PROJECT_CONFIG) $(MXENV_TARGET)
 	@echo "Checkout project sources"
-	@$(MXENV_PATH)mxdev -o -c $(PROJECT_CONFIG)
+	@mxdev -o -c $(PROJECT_CONFIG)
 	@touch $(SOURCES_TARGET)
 
 .PHONY: sources
@@ -207,13 +372,11 @@ MXMAKE_FILES?=$(MXMAKE_FOLDER)/files
 
 # set environment variables for mxmake
 define set_mxfiles_env
-	@export MXMAKE_MXENV_PATH=$(1)
-	@export MXMAKE_FILES=$(2)
+	@export MXMAKE_FILES=$(1)
 endef
 
 # unset environment variables for mxmake
 define unset_mxfiles_env
-	@unset MXMAKE_MXENV_PATH
 	@unset MXMAKE_FILES
 endef
 
@@ -224,24 +387,16 @@ else
 	@echo "[settings]" > $(PROJECT_CONFIG)
 endif
 
-LOCAL_PACKAGE_FILES:=
-ifneq ("$(wildcard pyproject.toml)","")
-	LOCAL_PACKAGE_FILES+=pyproject.toml
-endif
-ifneq ("$(wildcard setup.cfg)","")
-	LOCAL_PACKAGE_FILES+=setup.cfg
-endif
-ifneq ("$(wildcard setup.py)","")
-	LOCAL_PACKAGE_FILES+=setup.py
-endif
+LOCAL_PACKAGE_FILES:=$(wildcard pyproject.toml setup.cfg setup.py requirements.txt constraints.txt)
 
 FILES_TARGET:=requirements-mxdev.txt
 $(FILES_TARGET): $(PROJECT_CONFIG) $(MXENV_TARGET) $(SOURCES_TARGET) $(LOCAL_PACKAGE_FILES)
 	@echo "Create project files"
 	@mkdir -p $(MXMAKE_FILES)
-	$(call set_mxfiles_env,$(MXENV_PATH),$(MXMAKE_FILES))
-	@$(MXENV_PATH)mxdev -n -c $(PROJECT_CONFIG)
-	$(call unset_mxfiles_env,$(MXENV_PATH),$(MXMAKE_FILES))
+	$(call set_mxfiles_env,$(MXMAKE_FILES))
+	@mxdev -n -c $(PROJECT_CONFIG)
+	$(call unset_mxfiles_env)
+	@test -e $(MXMAKE_FILES)/pip.conf && cp $(MXMAKE_FILES)/pip.conf $(VENV_FOLDER)/pip.conf || :
 	@touch $(FILES_TARGET)
 
 .PHONY: mxfiles
@@ -269,11 +424,21 @@ ADDITIONAL_SOURCES_TARGETS?=
 
 INSTALLED_PACKAGES=$(MXMAKE_FILES)/installed.txt
 
+ifeq ("$(PACKAGES_ALLOW_PRERELEASES)","true")
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)","uv")
+PACKAGES_PRERELEASES=--prerelease=allow
+else
+PACKAGES_PRERELEASES=--pre
+endif
+else
+PACKAGES_PRERELEASES=
+endif
+
 PACKAGES_TARGET:=$(INSTALLED_PACKAGES)
 $(PACKAGES_TARGET): $(FILES_TARGET) $(ADDITIONAL_SOURCES_TARGETS)
 	@echo "Install python packages"
-	@$(MXENV_PATH)pip install -r $(FILES_TARGET)
-	@$(MXENV_PATH)pip freeze > $(INSTALLED_PACKAGES)
+	@$(PYTHON_PACKAGE_COMMAND) install $(PACKAGES_PRERELEASES) -r $(FILES_TARGET)
+	@$(PYTHON_PACKAGE_COMMAND) freeze > $(INSTALLED_PACKAGES)
 	@touch $(PACKAGES_TARGET)
 
 .PHONY: packages
@@ -286,8 +451,8 @@ packages-dirty:
 .PHONY: packages-clean
 packages-clean:
 	@test -e $(FILES_TARGET) \
-		&& test -e $(MXENV_PATH)pip \
-		&& $(MXENV_PATH)pip uninstall -y -r $(FILES_TARGET) \
+		&& test -e $(MXENV_PYTHON) \
+		&& $(MXENV_PYTHON) -m pip uninstall -y -r $(FILES_TARGET) \
 		|| :
 	@rm -f $(PACKAGES_TARGET)
 
@@ -302,16 +467,19 @@ CLEAN_TARGETS+=packages-clean
 COOKIECUTTER_TARGET:=$(SENTINEL_FOLDER)/cookiecutter.sentinel
 $(COOKIECUTTER_TARGET): $(MXENV_TARGET)
 	@echo "Install cookiecutter"
-	@$(MXENV_PATH)pip install "cookiecutter>=2.1.1"
+	@$(PYTHON_PACKAGE_COMMAND) install "cookiecutter>=2.6.0"
 	@touch $(COOKIECUTTER_TARGET)
 
+.PHONY: cookiecutter
+cookiecutter: $(COOKIECUTTER_TARGET)
+
 .PHONY: cookiecutter-dirty
 cookiecutter-dirty:
 	@rm -f $(COOKIECUTTER_TARGET)
 
 .PHONY: cookiecutter-clean
 cookiecutter-clean: cookiecutter-dirty
-	@test -e $(MXENV_PATH)pip && $(MXENV_PATH)pip uninstall -y cookiecutter || :
+	@test -e $(MXENV_PYTHON) && $(MXENV_PYTHON) -m pip uninstall -y cookiecutter || :
 	@rm -f $(COOKIECUTTER_TARGET)
 
 DIRTY_TARGETS+=cookiecutter-dirty
@@ -324,12 +492,18 @@ CLEAN_TARGETS+=cookiecutter-clean
 ZOPE_INSTANCE_FOLDER:=$(ZOPE_BASE_FOLDER)/instance
 ZOPE_INSTANCE_TARGET:=$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini $(ZOPE_INSTANCE_FOLDER)/etc/zope.conf $(ZOPE_INSTANCE_FOLDER)/etc/site.zcml
 
+ifeq (,$(ZOPE_TEMPLATE_CHECKOUT))
+	ZOPE_COOKIECUTTER_TEMPLATE_OPTIONS=
+else
+	ZOPE_COOKIECUTTER_TEMPLATE_OPTIONS=--checkout $(ZOPE_TEMPLATE_CHECKOUT)
+endif
+
 ${ZOPE_CONFIGURATION_FILE}:
 	@touch ${ZOPE_CONFIGURATION_FILE}
 
 $(ZOPE_INSTANCE_TARGET): $(COOKIECUTTER_TARGET) $(ZOPE_CONFIGURATION_FILE)
 	@echo Create Plone/Zope configuration from $(ZOPE_TEMPLATE) to $(ZOPE_INSTANCE_FOLDER)
-	@$(MXENV_PATH)cookiecutter -f --no-input --config-file $(ZOPE_CONFIGURATION_FILE) --output-dir $(ZOPE_BASE_FOLDER) $(ZOPE_TEMPLATE)
+	@cookiecutter -f --no-input ${ZOPE_COOKIECUTTER_TEMPLATE_OPTIONS} --config-file $(ZOPE_CONFIGURATION_FILE) --output-dir $(ZOPE_BASE_FOLDER) $(ZOPE_TEMPLATE)
 
 .PHONY: zope-instance
 zope-instance: $(ZOPE_INSTANCE_TARGET) $(SOURCES)
@@ -337,17 +511,17 @@ zope-instance: $(ZOPE_INSTANCE_TARGET) $(SOURCES)
 .PHONY: zope-start
 zope-start: $(ZOPE_INSTANCE_TARGET) $(PACKAGES_TARGET)
 	@echo "Start Zope/Plone with configuration in $(ZOPE_INSTANCE_FOLDER)"
-	@$(MXENV_PATH)runwsgi -v "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini"
+	@runwsgi -v "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini"
 
 .PHONY: zope-debug
 zope-debug: $(ZOPE_INSTANCE_TARGET) $(PACKAGES_TARGET)
 	@echo "Start Zope/Plone with configuration in $(ZOPE_INSTANCE_FOLDER)"
-	@$(MXENV_PATH)zconsole debug "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini"
+	@zconsole debug "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini"
 
 .PHONY: zope-runscript
 zope-runscript: $(ZOPE_INSTANCE_TARGET) $(PACKAGES_TARGET)
 	@echo "Run Zope/Plone Console Script $(ZOPE_SCRIPTNAME) in $(ZOPE_INSTANCE_FOLDER)"
-	@$(MXENV_PATH)zconsole run "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini" $(ZOPE_SCRIPTNAME)
+	@zconsole run "$(ZOPE_INSTANCE_FOLDER)/etc/zope.ini" $(ZOPE_SCRIPTNAME)
 
 .PHONY: zope-dirty
 zope-dirty:
@@ -366,6 +540,8 @@ INSTALL_TARGETS+=zope-instance
 DIRTY_TARGETS+=zope-dirty
 CLEAN_TARGETS+=zope-clean
 
+-include $(INCLUDE_MAKEFILE)
+
 ##############################################################################
 # Default targets
 ##############################################################################
@@ -378,6 +554,9 @@ $(INSTALL_TARGET): $(INSTALL_TARGETS)
 install: $(INSTALL_TARGET)
 	@touch $(INSTALL_TARGET)
 
+.PHONY: run
+run: $(RUN_TARGET)
+
 .PHONY: deploy
 deploy: $(DEPLOY_TARGETS)
 
@@ -399,3 +578,11 @@ runtime-clean:
 	@find . -name '*~' -exec rm -f {} +
 	@find . -name '__pycache__' -exec rm -fr {} +
 
+.PHONY: check
+check: $(CHECK_TARGETS)
+
+.PHONY: typecheck
+typecheck: $(TYPECHECK_TARGETS)
+
+.PHONY: format
+format: $(FORMAT_TARGETS)
diff --git a/mx.ini b/mx.ini
index 05b5b638..a41ae453 100644
--- a/mx.ini
+++ b/mx.ini
@@ -6,8 +6,7 @@
 #
 # read also README_MAKE.md in this folder
 #
-requirements-in = requirements.txt
-requirements-out = requirements-mxdev.txt
+main-package = -e .[test]
 
 # ignore own dev-package from existing constraints
 # because it is pinned in the plone-release
diff --git a/requirements.txt b/requirements.txt
index b07ce566..64d3a4a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
--e .[test] --install-option="--pre"
 -r https://dist.plone.org/release/6.0-dev/requirements.txt
 -c constraints.txt
 

From 73865e965235f3fefd03cbddd0fb7e8a73e44086 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 16 Apr 2024 14:59:17 +0200
Subject: [PATCH 58/74] lookup general mail/name from registry and use
 plone.api

---
 src/bda/plone/shop/mailnotify.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/bda/plone/shop/mailnotify.py b/src/bda/plone/shop/mailnotify.py
index ad050910..50dc70d7 100644
--- a/src/bda/plone/shop/mailnotify.py
+++ b/src/bda/plone/shop/mailnotify.py
@@ -25,16 +25,16 @@ def __init__(self, context):
 
     @property
     def admin_email(self):
-        props = api.portal.get_tool("portal_properties")
-        return get_shop_settings().admin_email or getattr(
-            props.site_properties, "email_from_address", ""
+        return (
+            get_shop_settings().admin_email
+            or api.portal.get_registry_record("plone.email_from_address")
         )
 
     @property
     def admin_name(self):
-        props = api.portal.get_tool("portal_properties")
-        return get_shop_settings().admin_name or getattr(
-            props.site_properties, "email_from_name", ""
+        return (
+            get_shop_settings().admin_name
+            or api.portal.get_registry_record("plone.email_from_name")
         )
 
 
@@ -89,8 +89,7 @@ def _lookup_text(self, field):
         enum = getattr(settings, field, None)
         if enum is None:
             return
-        portal_state = self.context.restrictedTraverse("@@plone_portal_state")
-        lang = portal_state.language()
+        lang = api.portal.get_current_language()
         for entry in enum:
             if entry["lang"] == lang:
                 return entry["text"]
@@ -142,8 +141,7 @@ def __init__(self, context):
 
     def payment_text(self, payment):
         settings = get_shop_payment_settings()
-        portal_state = self.context.restrictedTraverse("@@plone_portal_state")
-        lang = portal_state.language()
+        lang = api.portal.get_current_language()
         for entry in settings.payment_text:
             if entry["lang"] == lang and entry["payment"] == payment:
                 return entry["text"]

From cb3089ff57c6efc5fa3a939c304f680da69334a7 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 16 Apr 2024 15:08:58 +0200
Subject: [PATCH 59/74] catch missing payment_text entry

---
 src/bda/plone/shop/mailnotify.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/mailnotify.py b/src/bda/plone/shop/mailnotify.py
index 50dc70d7..8bb6434a 100644
--- a/src/bda/plone/shop/mailnotify.py
+++ b/src/bda/plone/shop/mailnotify.py
@@ -142,7 +142,7 @@ def __init__(self, context):
     def payment_text(self, payment):
         settings = get_shop_payment_settings()
         lang = api.portal.get_current_language()
-        for entry in settings.payment_text:
+        for entry in (settings.payment_text or []):
             if entry["lang"] == lang and entry["payment"] == payment:
                 return entry["text"]
         return ""

From b9eed33a80c5aeb0cf8b57f5acbbdc640ce79343 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 16 Apr 2024 18:16:14 +0200
Subject: [PATCH 60/74] update CI setup

---
 .github/workflows/main.yml | 12 +++++++-----
 Makefile                   |  2 +-
 constraints.txt            |  4 +++-
 mx.ini                     | 12 ++++++++----
 requirements.txt           |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1f135df2..0ee8ed4a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,22 +10,24 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.7"
-          - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
         plone:
-          - "6.0-dev"
+          - "6.0-latest"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}
         id: setup
-        uses: plone/setup-plone@v1.0.0
+        uses: plone/setup-plone@v2.0.0
         with:
           python-version: ${{ matrix.python }}
           plone-version: ${{ matrix.plone }}
+          setuptools-version: 69.5.1
+          additional-eggs: 'setuptools'
 
       - name: Install package
         run: |
diff --git a/Makefile b/Makefile
index 3a721155..468c41ab 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ PRIMARY_PYTHON?=python3
 
 # Minimum required Python version.
 # Default: 3.7
-PYTHON_MIN_VERSION?=3.7
+PYTHON_MIN_VERSION?=3.9
 
 # Install packages using the given package installer method.
 # Supported are `pip` and `uv`. If uv is used, its global availability is
diff --git a/constraints.txt b/constraints.txt
index c0e8f2f6..e84d7c39 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -1 +1,3 @@
--c https://dist.plone.org/release/6.0-dev/constraints.txt
+-c https://dist.plone.org/release/6.0-latest/constraints.txt
+
+yafowil.plone==5.0.0a2
diff --git a/mx.ini b/mx.ini
index a41ae453..ea35b207 100644
--- a/mx.ini
+++ b/mx.ini
@@ -21,6 +21,10 @@ bda_push = git@github.com:bluedynamics
 cs = https://github.com/conestack
 cs_push = git@github.com:conestack
 
+version-overrides =
+
+default-install-mode = direct
+
 [bda.plone.cart]
 url = ${settings:bda}/bda.plone.cart.git
 pushurl = ${settings:bda_push}/bda.plone.cart.git
@@ -58,10 +62,10 @@ branch = bootstrap-plone6
 # branch = main
 # install-mode = skip
 
-[yafowil.plone]
-url = ${settings:bda}/yafowil.plone.git
-pushurl = ${settings:bda_push}/yafowil.plone.git
-branch = bootstrap-plone6
+# [yafowil.plone]
+# url = ${settings:bda}/yafowil.plone.git
+# pushurl = ${settings:bda_push}/yafowil.plone.git
+# branch = master
 
 [yafowil.bootstrap]
 url = ${settings:cs}/yafowil.bootstrap.git
diff --git a/requirements.txt b/requirements.txt
index 64d3a4a3..6d8accaf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
--r https://dist.plone.org/release/6.0-dev/requirements.txt
+-r https://dist.plone.org/release/6.0-latest/requirements.txt
 -c constraints.txt
 
 # WSGI: A system for configuration of WSGI web components in declarative .ini format.

From f619d41d17340e68370d3858466fc12f70835398 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Tue, 16 Apr 2024 18:16:37 +0200
Subject: [PATCH 61/74] lint

---
 src/bda/plone/shop/browser/navigation.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bda/plone/shop/browser/navigation.py b/src/bda/plone/shop/browser/navigation.py
index 00c8b68f..6ae56ae8 100644
--- a/src/bda/plone/shop/browser/navigation.py
+++ b/src/bda/plone/shop/browser/navigation.py
@@ -100,7 +100,7 @@ def lookup_navigation_items(self, interface):
 
         def unsorted_items():
             to_adapt = self.context, self.request
-            for _, link in getAdapters(to_adapt, interface):
+            for _, link in getAdapters(to_adapt, interface):  # noqa
                 yield link
 
         cache[cache_key] = sorted(unsorted_items(), key=attrgetter("order"))
@@ -148,9 +148,7 @@ def buyables_in_context(self, context):
         catalog = api.portal.get_tool("portal_catalog")
         path = "/".join(context.getPhysicalPath())
         brains = catalog(path=path, object_provides=IBuyable.__identifier__)
-        for _ in brains:
-            return True
-        return False
+        return len(brains) > 0
 
     def context_is_default_page(self, context):
         """Return flag whether given context is default page in it's container."""

From 5e023101e5fc2799f3179f2dd692734d040ed8e9 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 09:29:30 +0200
Subject: [PATCH 62/74] fix registering registry interfaces. do not overwrite
 customized settings.

---
 src/bda/plone/shop/interfaces.py              |  17 +++
 .../plone/shop/profiles/default/registry.xml  | 108 +++---------------
 2 files changed, 30 insertions(+), 95 deletions(-)

diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 47d82cf4..19015c2d 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -79,18 +79,21 @@ class IShopSettings(model.Schema):
     default_item_display_gross = schema.Bool(
         title=_("label_default_item_display_gross", default="Display Gross by default"),
         required=False,
+        default=False,
     )
 
     currency = schema.Choice(
         title=_("label_currency", default="Currency"),
         description=_("help_currency", default="Choose the default currency"),
         vocabulary="bda.plone.shop.vocabularies.AvailableCurrenciesVocabulary",
+        default="EUR",
     )
 
     show_currency = schema.Choice(
         title=_("label_show_currency", default="Show the currency for items"),
         description=_("help_show_currency", default=""),
         vocabulary="bda.plone.shop.vocabularies.CurrencyDisplayOptionsVocabulary",
+        default="symbol",
     )
 
 
@@ -128,6 +131,7 @@ class IShopCartSettings(model.Schema):
             "article flag set",
         ),
         required=False,
+        default=5,
     )
 
     disable_max_article = schema.Bool(
@@ -205,11 +209,13 @@ class IShopArticleSettings(model.Schema):
         ),
         description=_("help_default_quantity_unit", default="default measurement"),
         vocabulary="bda.plone.shop.vocabularies.QuantityUnitVocabulary",
+        default="quantity",
     )
 
     default_item_net = schema.Decimal(
         title=_("label_default_item_net", default="Default Item net price"),
         required=False,
+        default=Decimal("10.0"),
     )
 
     default_item_comment_enabled = schema.Bool(
@@ -217,6 +223,7 @@ class IShopArticleSettings(model.Schema):
             "label_default_item_comment_enabled", default="Comment enabled by default"
         ),
         required=False,
+        default=True,
     )
 
     default_item_comment_required = schema.Bool(
@@ -225,6 +232,7 @@ class IShopArticleSettings(model.Schema):
             default="Comment required by default",
         ),
         required=False,
+        default=False,
     )
 
     default_item_quantity_unit_float = schema.Bool(
@@ -233,6 +241,7 @@ class IShopArticleSettings(model.Schema):
             default="Quantity as float as default",
         ),
         required=False,
+        default=False,
     )
 
     default_item_cart_count_limit = schema.Decimal(
@@ -287,6 +296,7 @@ class IShopShippingSettings(model.Schema):
             "i.e. downloads are not",
         ),
         required=False,
+        default=True,
     )
 
     available_shipping_methods = schema.List(
@@ -311,6 +321,7 @@ class IShopShippingSettings(model.Schema):
             "help_shipping_method", default="Default shipping method in checkout"
         ),
         vocabulary="bda.plone.shop.vocabularies.ShippingMethodsVocabulary",
+        default="default_shipping",
     )
 
     shipping_vat = schema.Choice(
@@ -319,6 +330,7 @@ class IShopShippingSettings(model.Schema):
             "help_shipping_vat", default="VAT used to calculate shipping costs"
         ),
         vocabulary="bda.plone.shop.vocabularies.VatVocabulary",
+        default="20",
     )
 
     # default shipping related settings
@@ -348,6 +360,7 @@ class IShopShippingSettings(model.Schema):
             "calculated from net price instead of gross.",
         ),
         required=False,
+        default=True,
     )
 
     flat_shipping_cost = schema.Decimal(
@@ -392,6 +405,7 @@ class IShopTaxSettings(model.Schema):
         title=_("label_default_vat", default="Default Value added tax name"),
         description=_("help_default_vat", default="Specify default vat name"),
         vocabulary="bda.plone.shop.vocabularies.VatVocabulary",
+        default="20",
     )
 
 
@@ -551,6 +565,7 @@ class IInvoiceSettings(model.Schema):
         description=_("help_invoice_country", default="Country of invoice sender"),
         required=False,
         vocabulary="bda.plone.shop.vocabularies.CountryVocabulary",
+        default="040",
     )
 
     default_invoice_phone = schema.TextLine(
@@ -645,6 +660,7 @@ class IPaymentTextSettings(model.Schema):
             "help_payment_method", default="Default payment method in checkout"
         ),
         vocabulary="bda.plone.shop.vocabularies.PaymentMethodsVocabulary",
+        default="invoice",
     )
 
     skip_payment_if_order_contains_reservations = schema.Bool(
@@ -670,4 +686,5 @@ class IPaymentTextSettings(model.Schema):
             "label_cash_on_delivery_costs", default="Cash on delivery costs in gross"
         ),
         required=False,
+        default=Decimal("9.9"),
     )
diff --git a/src/bda/plone/shop/profiles/default/registry.xml b/src/bda/plone/shop/profiles/default/registry.xml
index 65d41fad..f12f61b5 100644
--- a/src/bda/plone/shop/profiles/default/registry.xml
+++ b/src/bda/plone/shop/profiles/default/registry.xml
@@ -5,110 +5,28 @@
            interface='Products.CMFPlone.interfaces.IBundleRegistry'>
     <value key="enabled">True</value>
     <value key="compile">False</value>
-    <value key="jscompilation">++resource++bda.plone.shop.js</value>
-    <value key="csscompilation">++resource++bda.plone.shop.css</value>
+    <value key="jscompilation">++resource++bda.plone.shop/shop.js</value>
+    <value key="csscompilation">++resource++bda.plone.shop/shop.min.css</value>
     <value key="depends">bdajax</value>
   </records>
 
-  <records interface="bda.plone.shop.interfaces.IShopSettings">
-    <value key="admin_email" purge="false"></value>
-    <value key="admin_name" purge="false"></value>
-    <value key="add_customer_role_to_new_users" purge="false">True</value>
-    <value key="currency" purge="false">EUR</value>
-    <value key="show_currency" purge="false">symbol</value>
-    <value key="default_item_display_gross" purge="false">False</value>
-  </records>
+  <!-- register settings from interfaces.
+       Default values are set in the schema in order to keep
+       customized settings after an upgrade step -->
+  <records interface="bda.plone.shop.interfaces.IShopSettings" prefix="plone.shop" />
 
-  <records interface="bda.plone.shop.interfaces.IShopCartSettings">
-    <value key="hide_cart_if_empty" purge="false">False</value>
-    <value key="max_artice_count" purge="false">5</value>
-    <value key="disable_max_article" purge="false">True</value>
-    <value key="summary_total_only" purge="false">False</value>
-    <value key="show_checkout" purge="false">False</value>
-    <value key="show_to_cart" purge="false">True</value>
-  </records>
+  <records interface="bda.plone.shop.interfaces.IShopCartSettings" />
 
-  <records interface="bda.plone.shop.interfaces.IShopArticleSettings">
-    <value key="quantity_units" purge="false">
-      <element>quantity</element>
-      <element>meter</element>
-      <element>kilo</element>
-      <element>liter</element>
-    </value>
-    <value key="default_item_quantity_unit" purge="false">quantity</value>
-    <value key="default_item_net" purge="false">10</value>
-    <value key="default_item_comment_enabled" purge="false">True</value>
-    <value key="default_item_comment_required" purge="false">False</value>
-    <value key="default_item_quantity_unit_float" purge="false">False</value>
-    <value key="default_item_cart_count_limit" purge="false"></value>
-    <value key="default_item_stock_warning_threshold" purge="false"></value>
-  </records>
+  <records interface="bda.plone.shop.interfaces.IShopArticleSettings" />
 
-  <records interface="bda.plone.shop.interfaces.IShopShippingSettings">
-    <value key="default_shipping_item_shippable" purge="false">True</value>
-    <value key="available_shipping_methods" purge="false">
-      <element>default_shipping</element>
-      <element>cash_and_carry</element>
-    </value>
-    <value key="shipping_method" purge="false">default_shipping</value>
-    <value key="shipping_vat" purge="false">20</value>
-    <value key="shipping_limit_from_gross" purge="false">True</value>
-    <value key="free_shipping_limit" purge="false">200.0</value>
-    <value key="flat_shipping_cost" purge="false">10.0</value>
-    <value key="item_shipping_cost" purge="false">0.0</value>
-  </records>
+  <records interface="bda.plone.shop.interfaces.IShopShippingSettings" />
 
-  <records interface="bda.plone.shop.interfaces.IShopTaxSettings">
-    <value key="vat" purge="false">
-      <element>0</element>
-      <element>2.5</element>
-      <element>3.8</element>
-      <element>8</element>
-      <element>7.7</element>
-      <element>10</element>
-      <element>15</element>
-      <element>20</element>
-      <element>25</element>
-    </value>
-    <value key="default_item_vat" purge="false">20</value>
-  </records>
+  <records interface="bda.plone.shop.interfaces.IShopTaxSettings" />
 
-  <records interface="bda.plone.shop.interfaces.INotificationTextSettings">
-    <value key="global_order_text" purge="false"></value>
-    <value key="global_overbook_text" purge="false"></value>
-    <value key="order_text" purge="false"></value>
-    <value key="overbook_text" purge="false"></value>
-  </records>
+  <records interface="bda.plone.shop.interfaces.INotificationTextSettings" />
 
-  <records interface="bda.plone.shop.interfaces.IInvoiceSettings">
-    <value key="default_invoice_company" purge="false"></value>
-    <value key="default_invoice_companyadd" purge="false"></value>
-    <value key="default_invoice_firstname" purge="false"></value>
-    <value key="default_invoice_lastname" purge="false"></value>
-    <value key="default_invoice_street" purge="false"></value>
-    <value key="default_invoice_zip" purge="false"></value>
-    <value key="default_invoice_city" purge="false"></value>
-    <value key="default_invoice_country" purge="false">040</value>
-    <value key="default_invoice_phone" purge="false"></value>
-    <value key="default_invoice_email" purge="false"></value>
-    <value key="default_invoice_web" purge="false"></value>
-    <value key="default_invoice_iban" purge="false"></value>
-    <value key="default_invoice_bic" purge="false"></value>
-  </records>
+  <records interface="bda.plone.shop.interfaces.IInvoiceSettings" />
 
-  <records interface="bda.plone.shop.interfaces.IPaymentTextSettings">
-    <value key="available_payment_methods" purge="false">
-      <element>cash</element>
-      <element>cash_in_advance</element>
-      <element>cash_on_delivery</element>
-      <element>debit_order</element>
-      <element>invoice</element>
-      <element>six_payment</element>
-    </value>
-    <value key="payment_method" purge="false">invoice</value>
-    <value key="skip_payment_if_order_contains_reservations" purge="false">False</value>
-    <value key="payment_text" purge="false"></value>
-    <value key="cash_on_delivery_costs" purge="false">9.9</value>
-  </records>
+  <records interface="bda.plone.shop.interfaces.IPaymentTextSettings" />
 
 </registry>

From 7993cac1084a1ffca601936c8dacddfe1edc6ade Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 09:48:25 +0200
Subject: [PATCH 63/74] refactor resources to SCSS and add upgradestep

---
 Gruntfile.js                                  |   43 -
 package-lock.json                             | 1961 +++++++++++++++++
 package.json                                  |   21 +-
 .../shop.less => resources/scss/shop.scss     |   65 +-
 src/bda/plone/shop/browser/configure.zcml     |   34 +-
 src/bda/plone/shop/browser/shop_icon.png      |  Bin 874 -> 0 bytes
 src/bda/plone/shop/browser/static/shop.css    |  135 ++
 .../plone/shop/browser/static/shop.css.map    |    1 +
 .../plone/shop/browser/{ => static}/shop.js   |    0
 .../plone/shop/browser/static/shop.min.css    |    1 +
 .../plone/shop/profiles/default/metadata.xml  |    2 +-
 src/bda/plone/shop/upgrades/configure.zcml    |    8 +
 12 files changed, 2164 insertions(+), 107 deletions(-)
 delete mode 100644 Gruntfile.js
 create mode 100644 package-lock.json
 rename src/bda/plone/shop/browser/shop.less => resources/scss/shop.scss (75%)
 delete mode 100644 src/bda/plone/shop/browser/shop_icon.png
 create mode 100644 src/bda/plone/shop/browser/static/shop.css
 create mode 100644 src/bda/plone/shop/browser/static/shop.css.map
 rename src/bda/plone/shop/browser/{ => static}/shop.js (100%)
 create mode 100644 src/bda/plone/shop/browser/static/shop.min.css

diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 8e88ba6e..00000000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,43 +0,0 @@
-module.exports = function (grunt) {
-    'use strict';
-    grunt.initConfig({
-        pkg: grunt.file.readJSON('package.json'),
-        less: {
-            dist: {
-                options: {
-                    paths: [],
-                    strictMath: false,
-                    sourceMap: true,
-                    outputSourceFiles: true,
-                    sourceMapURL: '++resource++bda.plone.shop.css.map',
-                    sourceMapFilename: 'src/bda/plone/shop/browser/shop.css.map',
-                    modifyVars: {
-                        "isPlone": "false"
-                    }
-                },
-                files: {
-                    'src/bda/plone/shop/browser/shop.css': 'src/bda/plone/shop/browser/shop.less',
-                }
-            }
-        },
-        sed: {
-            sed0: {
-                path: 'src/bda/plone/shop/browser/shop.css.map',
-                pattern: 'src/bda/plone/shop/browser/shop.less',
-                replacement: '++resource++bda.plone.shop.less',
-            }
-        },
-        watch: {
-            scripts: {
-                files: ['src/bda/plone/shop/browser/shop.less'],
-                tasks: ['less', 'sed']
-            }
-        }
-    });
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-less');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.loadNpmTasks('grunt-sed');
-    grunt.registerTask('default', ['watch']);
-    grunt.registerTask('compile', ['less', 'sed']);
-};
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..25fd09ca
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1961 @@
+{
+  "name": "bda.plone.shop",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "bda.plone.shop",
+      "version": "1.0.0",
+      "dependencies": {
+        "bootstrap": "^5.3.3"
+      },
+      "devDependencies": {
+        "clean-css-cli": "^5.4.0",
+        "nodemon": "^2.0.14",
+        "npm-run-all": "^4.1.5",
+        "sass": "^1.43.3"
+      }
+    },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bootstrap": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "peerDependencies": {
+        "@popperjs/core": "^2.11.8"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/clean-css-cli": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.3.tgz",
+      "integrity": "sha512-MUAta8pEqA/d2DKQwtZU5nm0Og8TCyAglOx3GlWwjhGdKBwY4kVF6E5M6LU/jmmuswv+HbYqG/dKKkq5p1dD0A==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "^3.5.2",
+        "clean-css": "^5.3.3",
+        "commander": "7.x",
+        "glob": "^7.1.6"
+      },
+      "bin": {
+        "cleancss": "bin/cleancss"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/ignore-by-default": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+      "dev": true
+    },
+    "node_modules/immutable": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
+      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/nodemon": {
+      "version": "2.0.22",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+      "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "^3.5.2",
+        "debug": "^3.2.7",
+        "ignore-by-default": "^1.0.1",
+        "minimatch": "^3.1.2",
+        "pstree.remy": "^1.1.8",
+        "semver": "^5.7.1",
+        "simple-update-notifier": "^1.0.7",
+        "supports-color": "^5.5.0",
+        "touch": "^3.1.0",
+        "undefsafe": "^2.0.5"
+      },
+      "bin": {
+        "nodemon": "bin/nodemon.js"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nodemon"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+      "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "bin": {
+        "npm-run-all": "bin/npm-run-all/index.js",
+        "run-p": "bin/run-p/index.js",
+        "run-s": "bin/run-s/index.js"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pidtree": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
+      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/pstree.remy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+      "dev": true
+    },
+    "node_modules/read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/sass": {
+      "version": "1.75.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.75.0.tgz",
+      "integrity": "sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/simple-update-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "dev": true,
+      "dependencies": {
+        "semver": "~7.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
+      "dev": true
+    },
+    "node_modules/string.prototype.padend": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz",
+      "integrity": "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/touch": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
+      "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+      "dev": true,
+      "dependencies": {
+        "nopt": "~1.0.10"
+      },
+      "bin": {
+        "nodetouch": "bin/nodetouch.js"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/undefsafe": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
index 64744bba..914fafd7 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,20 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "grunt": "latest",
-    "grunt-contrib-copy": "latest",
-    "grunt-contrib-less": "latest",
-    "grunt-contrib-watch": "latest",
-    "grunt-sed": "latest",
-    "request": "latest"
+    "clean-css-cli": "^5.4.0",
+    "nodemon": "^2.0.14",
+    "npm-run-all": "^4.1.5",
+    "sass": "^1.43.3"
+  },
+  "scripts": {
+    "watch": "nodemon --watch resources/scss/ --ext scss --exec \"npm run css-main\"",
+    "build": "npm run css-main",
+    "css-main": "npm-run-all css-compile-main css-minify-main",
+    "css-compile-main": "sass --load-path=node_modules --style expanded --no-error-css resources/scss/shop.scss:src/bda/plone/shop/browser/static/shop.css",
+    "css-minify-main": "cleancss -O1 --format breakWith=lf --with-rebase --output src/bda/plone/shop/browser/static/shop.min.css src/bda/plone/shop/browser/static/shop.css"
+  },
+  "dependencies": {
+    "bootstrap": "^5.3.3"
   }
 }
+
diff --git a/src/bda/plone/shop/browser/shop.less b/resources/scss/shop.scss
similarity index 75%
rename from src/bda/plone/shop/browser/shop.less
rename to resources/scss/shop.scss
index 0e1137a6..b49fad8f 100644
--- a/src/bda/plone/shop/browser/shop.less
+++ b/resources/scss/shop.scss
@@ -1,23 +1,20 @@
-// Plone 5 Styles
-
-// get Plone variables
-@import url("https://raw.githubusercontent.com/plone/Products.CMFPlone/master/Products/CMFPlone/static/patterns/toolbar/src/css/variables.less");
-@import url("https://raw.githubusercontent.com/plone/plonetheme.barceloneta/master/plonetheme/barceloneta/theme/less/variables.plone.less");
-
 .buyable.viewlet {
     clear: both;
     margin: 1em 0 2em 0;
 
     dl.details {
         display: inline-block;
+
         dt,
         dd {
             display: inline-block;
             vertical-align: middle;
         }
+
         dt {
             margin-right: 0.25em;
         }
+
         dd {
             margin-right: 1em;
         }
@@ -25,65 +22,74 @@
 
     div.availability {
         // display: inline-block;
-        position:relative;
+        position: relative;
         vertical-align: middle;
     }
+
     div.availability_details {
         z-index: 1000;
         position: absolute;
         top: 2em;
         margin-left: -0.5em;
-        background-color: @plone-input-bg;
-        border-radius: @plone-border-radius-base;
-        border: @plone-portlet-border;
-        box-shadow: 0 1px 2px rgba(0,0,0,.25);
+        background-color: var(--bs-body-bg);
+        border-radius: var(--bs-border-radius);
+        border: var(--bs-border-style) var(--bs-border-width) var(--bs-border-color);
+        box-shadow: 0 1px 2px rgba(0, 0, 0, .25);
         padding: 1em;
         min-width: 14em;
         display: none;
+
         p {
             margin-bottom: 0;
         }
     }
+
     div.signal {
         vertical-align: sub;
         border: #ccc 1px solid;
-        border-radius: @plone-border-radius-base;
+        border-radius: var(--bs-border-radius);
         width: 1em;
         height: 1em;
         display: inline-block;
     }
+
     div.signal.red {
         background-color: red;
     }
+
     div.signal.orange {
         background-color: orange;
     }
+
     div.signal.yellow {
         background-color: yellow;
     }
+
     div.signal.green {
         background-color: green;
     }
+
     dd.price.original {
-        color:#ae0000;
-        text-decoration:line-through;
-        padding-right:0.2em;
+        color: #ae0000;
+        text-decoration: line-through;
+        padding-right: 0.2em;
     }
 }
 
 .portletShopAdmin {
-  .portletContent {
-    ul {
-      padding-top: 0.5em!important;
-      padding-bottom: 1em!important;
-      li {
-        a {
-          padding: 0.5em 1em 0em 2em!important;
-          border: 0!important;
+    .portletContent {
+        ul {
+            padding-top: 0.5em !important;
+            padding-bottom: 1em !important;
+
+            li {
+                a {
+                    padding: 0.5em 1em 0em 2em !important;
+                    border: 0 !important;
+                }
+            }
         }
-      }
     }
-  }
 }
 
 #formfield-form-widgets-IBuyablePeriodBehavior-buyable_effective select,
@@ -98,7 +104,7 @@
     border-top: 1px solid rgba(255, 255, 255, 0.17);
 }
 
-#shop_toolbar_menu .actionSeparator > span {
+#shop_toolbar_menu .actionSeparator>span {
     color: #ccc;
     font-weight: 400;
 }
@@ -107,22 +113,27 @@
 #form-widgets-IPaymentTextSettings-available_payment_methods {
     width: 100%;
 }
+
 #form-widgets-IPaymentTextSettings-available_payment_methods td:nth-child(1),
 #form-widgets-IPaymentTextSettings-available_payment_methods td:nth-child(3) {
     width: 40%;
 }
+
 #form-widgets-IPaymentTextSettings-available_payment_methods-from,
 #form-widgets-IPaymentTextSettings-available_payment_methods-to {
     width: 100%;
 }
+
 #form-widgets-IPaymentTextSettings-payment_method {
     width: 100%;
 }
+
 #form-widgets-IPaymentTextSettings-payment_text td.cell-1,
 #form-widgets-IPaymentTextSettings-payment_text td.cell-2,
 #form-widgets-IPaymentTextSettings-payment_text td.cell-3 {
     width: 30%;
 }
+
 #form-widgets-IPaymentTextSettings-payment_text select {
     width: 30%;
 }
@@ -131,10 +142,12 @@
 #form-widgets-IShopShippingSettings-available_shipping_methods {
     width: 100%;
 }
+
 #form-widgets-IShopShippingSettings-available_shipping_methods td:nth-child(1),
 #form-widgets-IShopShippingSettings-available_shipping_methods td:nth-child(3) {
     width: 40%;
 }
+
 #form-widgets-IShopShippingSettings-available_shipping_methods-from,
 #form-widgets-IShopShippingSettings-available_shipping_methods-to {
     width: 100%;
diff --git a/src/bda/plone/shop/browser/configure.zcml b/src/bda/plone/shop/browser/configure.zcml
index 532c2e62..7927a46d 100644
--- a/src/bda/plone/shop/browser/configure.zcml
+++ b/src/bda/plone/shop/browser/configure.zcml
@@ -179,37 +179,9 @@
     permission="cmf.ManagePortal" />
 
   <!-- generic resources -->
-  <browser:resource
-    name="bda.plone.shop.js"
-    file="shop.js"
-    layer="..interfaces.IShopExtensionLayer" />
-
-  <browser:resource
-    name="shop_icon.png"
-    file="shop_icon.png"
-    layer="..interfaces.IShopExtensionLayer" />
-
-  <!-- plone 4 resources -->
-  <browser:resource
-    zcml:condition="not-have plone-5"
-    name="bda.plone.shop.css"
-    file="shop_p4.css"
-    layer="..interfaces.IShopExtensionLayer" />
-
-  <!-- plone 5 resources -->
-  <browser:resource
-    name="bda.plone.shop.less"
-    file="shop.less"
-    layer="..interfaces.IShopExtensionLayer" />
-
-  <browser:resource
-    name="bda.plone.shop.css"
-    file="shop.css"
-    layer="..interfaces.IShopExtensionLayer" />
-
-  <browser:resource
-    name="bda.plone.shop.css.map"
-    file="shop.css.map"
+  <browser:resourceDirectory
+    name="bda.plone.shop"
+    directory="static"
     layer="..interfaces.IShopExtensionLayer" />
 
   <browser:menu
diff --git a/src/bda/plone/shop/browser/shop_icon.png b/src/bda/plone/shop/browser/shop_icon.png
deleted file mode 100644
index a9538ac016bdd92da5e5aea487b1ece177b3d63d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 874
zcmV-w1C{)VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru-3kZ{Bo6XApxOWc0{2No
zK~y-)b&<hq9CaMUKfjsT%<N8+%_bX*YlF?UWUCQM|A1JmAj=|Xsn|map}o{YJ!#eA
zMf8voA$Sl>JrqPJrIb+8C<ryBghG2LC72T29BeSgX0y}Gc6TQ`v-A7?JQ(YW`rw_u
z@B4VXCjic6vrJU00L+~}z1Q-*Vy3tEs1=3<v=(jC{MoBkuZeW}yV9jgs{kMD-p%C3
z2I9S*9!5(g@#f{rdVYNTi@`?Yq^)(22tzudySmucy77yY-xRN3KcgQ!;G-i)5Pu2g
zjvt>H>F+;kcpgG2{tt%MEcyOI@y3l;0BHjJSSo$B_rQU%=O!mHhlY4^|2{!qAEE0K
zrBXz$`;@I+yLiU7pMO1->VDC-e-KwjNB6yu%Pn?iGOo(!89IBGwOhBy9X|YbybcJU
zGBd-k)6*=htPB`t93M;d_q*D4iPzU@1_8F~BBVs@JakgWG23_V(wEPZHO<cqI|$xT
zLV)X%a2)EZt5~*;jN||8pmygD+P0BETI&<$+m3VItW;bTMMS<&Gmgm)53>~nbZ0XE
zGFY9OA}E)6vbadpYS~sC$8q3!1fB;<(R%oh{ijY*K6HrXo!EcwsL^qZkn(94k=9s&
zls`FIKdS(QfVDMz-)H~a9C62-LMgOT{C432-qouJpeDq+<tue15y!8|j+i&c#&AbQ
zFqW1OrU_aT4h)bO9Hcori*C0`0GpQewfVB+{GO2V<hGQlmQpm6NnW~mk$kbpM!C$|
z>@2k~WO!nNeZ?Za=i%MEM<_&N*)ZNR&UxOWN2WQYrKBMxjW8ruimgh8PzdTkAOumX
z#pBIQf>sMDrQU*1mX)fDcYtZ&({%cCCk)>Yv?fs~kj&-Sn4d=ofmVv{LV><LduZOi
zO=K8feq5`)OJ~VB$1zSMlcnA;oKaDf2!Qs^Ede9}!?L29Z6CX))b}g(y84F!9dmt{
zPLC(s?N^0TSq(x9Q4PDgZk|7Q@LLuZ+MV)00MqGXI@knL4gdfE07*qoM6N<$f>N`d
A3jhEB

diff --git a/src/bda/plone/shop/browser/static/shop.css b/src/bda/plone/shop/browser/static/shop.css
new file mode 100644
index 00000000..bcc83315
--- /dev/null
+++ b/src/bda/plone/shop/browser/static/shop.css
@@ -0,0 +1,135 @@
+.buyable.viewlet {
+  clear: both;
+  margin: 1em 0 2em 0;
+}
+.buyable.viewlet dl.details {
+  display: inline-block;
+}
+.buyable.viewlet dl.details dt,
+.buyable.viewlet dl.details dd {
+  display: inline-block;
+  vertical-align: middle;
+}
+.buyable.viewlet dl.details dt {
+  margin-right: 0.25em;
+}
+.buyable.viewlet dl.details dd {
+  margin-right: 1em;
+}
+.buyable.viewlet div.availability {
+  position: relative;
+  vertical-align: middle;
+}
+.buyable.viewlet div.availability_details {
+  z-index: 1000;
+  position: absolute;
+  top: 2em;
+  margin-left: -0.5em;
+  background-color: var(--bs-body-bg);
+  border-radius: var(--bs-border-radius);
+  border: var(--bs-border-style) var(--bs-border-width) var(--bs-border-color);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
+  padding: 1em;
+  min-width: 14em;
+  display: none;
+}
+.buyable.viewlet div.availability_details p {
+  margin-bottom: 0;
+}
+.buyable.viewlet div.signal {
+  vertical-align: sub;
+  border: #ccc 1px solid;
+  border-radius: var(--bs-border-radius);
+  width: 1em;
+  height: 1em;
+  display: inline-block;
+}
+.buyable.viewlet div.signal.red {
+  background-color: red;
+}
+.buyable.viewlet div.signal.orange {
+  background-color: orange;
+}
+.buyable.viewlet div.signal.yellow {
+  background-color: yellow;
+}
+.buyable.viewlet div.signal.green {
+  background-color: green;
+}
+.buyable.viewlet dd.price.original {
+  color: #ae0000;
+  text-decoration: line-through;
+  padding-right: 0.2em;
+}
+
+.portletShopAdmin .portletContent ul {
+  padding-top: 0.5em !important;
+  padding-bottom: 1em !important;
+}
+.portletShopAdmin .portletContent ul li a {
+  padding: 0.5em 1em 0em 2em !important;
+  border: 0 !important;
+}
+
+#formfield-form-widgets-IBuyablePeriodBehavior-buyable_effective select,
+#formfield-form-widgets-IBuyablePeriodBehavior-buyable_expires select,
+#formfield-form-widgets-IBuyableBehavior-item_vat select,
+#formfield-form-widgets-IBuyableBehavior-item_quantity_unit select {
+  display: inline-block;
+  width: unset;
+}
+
+#shop_toolbar_menu .actionSeparator {
+  border-top: 1px solid rgba(255, 255, 255, 0.17);
+}
+
+#shop_toolbar_menu .actionSeparator > span {
+  color: #ccc;
+  font-weight: 400;
+}
+
+/* payment settings */
+#form-widgets-IPaymentTextSettings-available_payment_methods {
+  width: 100%;
+}
+
+#form-widgets-IPaymentTextSettings-available_payment_methods td:nth-child(1),
+#form-widgets-IPaymentTextSettings-available_payment_methods td:nth-child(3) {
+  width: 40%;
+}
+
+#form-widgets-IPaymentTextSettings-available_payment_methods-from,
+#form-widgets-IPaymentTextSettings-available_payment_methods-to {
+  width: 100%;
+}
+
+#form-widgets-IPaymentTextSettings-payment_method {
+  width: 100%;
+}
+
+#form-widgets-IPaymentTextSettings-payment_text td.cell-1,
+#form-widgets-IPaymentTextSettings-payment_text td.cell-2,
+#form-widgets-IPaymentTextSettings-payment_text td.cell-3 {
+  width: 30%;
+}
+
+#form-widgets-IPaymentTextSettings-payment_text select {
+  width: 30%;
+}
+
+/* shipping settings */
+#form-widgets-IShopShippingSettings-available_shipping_methods {
+  width: 100%;
+}
+
+#form-widgets-IShopShippingSettings-available_shipping_methods td:nth-child(1),
+#form-widgets-IShopShippingSettings-available_shipping_methods td:nth-child(3) {
+  width: 40%;
+}
+
+#form-widgets-IShopShippingSettings-available_shipping_methods-from,
+#form-widgets-IShopShippingSettings-available_shipping_methods-to {
+  width: 100%;
+}
+
+/*# sourceMappingURL=shop.css.map */
diff --git a/src/bda/plone/shop/browser/static/shop.css.map b/src/bda/plone/shop/browser/static/shop.css.map
new file mode 100644
index 00000000..2074ec9c
--- /dev/null
+++ b/src/bda/plone/shop/browser/static/shop.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../../../../../resources/scss/shop.scss"],"names":[],"mappings":"AAAA;EACI;EACA;;AAEA;EACI;;AAEA;AAAA;EAEI;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAIR;EAEI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;;;AAMA;EACI;EACA;;AAGI;EACI;EACA;;;AAOpB;AAAA;AAAA;AAAA;EAII;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;AACA;EACI;;;AAGJ;AAAA;EAEI;;;AAGJ;AAAA;EAEI;;;AAGJ;EACI;;;AAGJ;AAAA;AAAA;EAGI;;;AAGJ;EACI;;;AAGJ;AACA;EACI;;;AAGJ;AAAA;EAEI;;;AAGJ;AAAA;EAEI","file":"shop.css"}
\ No newline at end of file
diff --git a/src/bda/plone/shop/browser/shop.js b/src/bda/plone/shop/browser/static/shop.js
similarity index 100%
rename from src/bda/plone/shop/browser/shop.js
rename to src/bda/plone/shop/browser/static/shop.js
diff --git a/src/bda/plone/shop/browser/static/shop.min.css b/src/bda/plone/shop/browser/static/shop.min.css
new file mode 100644
index 00000000..99ea1f05
--- /dev/null
+++ b/src/bda/plone/shop/browser/static/shop.min.css
@@ -0,0 +1 @@
+.buyable.viewlet{clear:both;margin:1em 0 2em 0}.buyable.viewlet dl.details{display:inline-block}.buyable.viewlet dl.details dd,.buyable.viewlet dl.details dt{display:inline-block;vertical-align:middle}.buyable.viewlet dl.details dt{margin-right:.25em}.buyable.viewlet dl.details dd{margin-right:1em}.buyable.viewlet div.availability{position:relative;vertical-align:middle}.buyable.viewlet div.availability_details{z-index:1000;position:absolute;top:2em;margin-left:-.5em;background-color:var(--bs-body-bg);border-radius:var(--bs-border-radius);border:var(--bs-border-style) var(--bs-border-width) var(--bs-border-color);box-shadow:0 1px 2px rgba(0,0,0,.25);padding:1em;min-width:14em;display:none}.buyable.viewlet div.availability_details p{margin-bottom:0}.buyable.viewlet div.signal{vertical-align:sub;border:#ccc 1px solid;border-radius:var(--bs-border-radius);width:1em;height:1em;display:inline-block}.buyable.viewlet div.signal.red{background-color:red}.buyable.viewlet div.signal.orange{background-color:orange}.buyable.viewlet div.signal.yellow{background-color:#ff0}.buyable.viewlet div.signal.green{background-color:green}.buyable.viewlet dd.price.original{color:#ae0000;text-decoration:line-through;padding-right:.2em}.portletShopAdmin .portletContent ul{padding-top:.5em!important;padding-bottom:1em!important}.portletShopAdmin .portletContent ul li a{padding:.5em 1em 0 2em!important;border:0!important}#formfield-form-widgets-IBuyableBehavior-item_quantity_unit select,#formfield-form-widgets-IBuyableBehavior-item_vat select,#formfield-form-widgets-IBuyablePeriodBehavior-buyable_effective select,#formfield-form-widgets-IBuyablePeriodBehavior-buyable_expires select{display:inline-block;width:unset}#shop_toolbar_menu .actionSeparator{border-top:1px solid rgba(255,255,255,.17)}#shop_toolbar_menu .actionSeparator>span{color:#ccc;font-weight:400}#form-widgets-IPaymentTextSettings-available_payment_methods{width:100%}#form-widgets-IPaymentTextSettings-available_payment_methods td:first-child,#form-widgets-IPaymentTextSettings-available_payment_methods td:nth-child(3){width:40%}#form-widgets-IPaymentTextSettings-available_payment_methods-from,#form-widgets-IPaymentTextSettings-available_payment_methods-to{width:100%}#form-widgets-IPaymentTextSettings-payment_method{width:100%}#form-widgets-IPaymentTextSettings-payment_text td.cell-1,#form-widgets-IPaymentTextSettings-payment_text td.cell-2,#form-widgets-IPaymentTextSettings-payment_text td.cell-3{width:30%}#form-widgets-IPaymentTextSettings-payment_text select{width:30%}#form-widgets-IShopShippingSettings-available_shipping_methods{width:100%}#form-widgets-IShopShippingSettings-available_shipping_methods td:first-child,#form-widgets-IShopShippingSettings-available_shipping_methods td:nth-child(3){width:40%}#form-widgets-IShopShippingSettings-available_shipping_methods-from,#form-widgets-IShopShippingSettings-available_shipping_methods-to{width:100%}
\ No newline at end of file
diff --git a/src/bda/plone/shop/profiles/default/metadata.xml b/src/bda/plone/shop/profiles/default/metadata.xml
index 72bd9a08..91dcdfae 100644
--- a/src/bda/plone/shop/profiles/default/metadata.xml
+++ b/src/bda/plone/shop/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>11</version>
+  <version>2000</version>
   <dependencies>
     <dependency>profile-plone.app.registry:default</dependency>
     <dependency>profile-collective.z3cform.datagridfield:default</dependency>
diff --git a/src/bda/plone/shop/upgrades/configure.zcml b/src/bda/plone/shop/upgrades/configure.zcml
index 77e30761..23091b8b 100644
--- a/src/bda/plone/shop/upgrades/configure.zcml
+++ b/src/bda/plone/shop/upgrades/configure.zcml
@@ -123,4 +123,12 @@
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeDepends
+    title="Update registry"
+    source="11"
+    destination="2000"
+    profile="bda.plone.shop:default"
+    import_steps="plone.app.registry"
+    run_deps="False" />
+
 </configure>

From 6a99d0bd2bc7e7807ba01723f97de307f8ea856b Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 11:55:11 +0200
Subject: [PATCH 64/74] add uninstall profile

---
 src/bda/plone/shop/interfaces.py              |  1 -
 src/bda/plone/shop/profiles.zcml              | 12 +++++-
 .../plone/shop/profiles/uninstall/actions.xml | 34 +++++++++++++++++
 .../shop/profiles/uninstall/browserlayer.xml  |  7 ++++
 .../plone/shop/profiles/uninstall/catalog.xml | 10 +++++
 .../shop/profiles/uninstall/controlpanel.xml  | 21 ++++++++++
 .../uninstall/memberdata_properties.xml       | 28 ++++++++++++++
 .../shop/profiles/uninstall/registry.xml      | 14 +++++++
 src/bda/plone/shop/setuphandlers.py           | 38 +++++++++++++------
 src/bda/plone/shop/vocabularies.py            | 11 ++++--
 10 files changed, 158 insertions(+), 18 deletions(-)
 create mode 100644 src/bda/plone/shop/profiles/uninstall/actions.xml
 create mode 100644 src/bda/plone/shop/profiles/uninstall/browserlayer.xml
 create mode 100644 src/bda/plone/shop/profiles/uninstall/catalog.xml
 create mode 100644 src/bda/plone/shop/profiles/uninstall/controlpanel.xml
 create mode 100644 src/bda/plone/shop/profiles/uninstall/memberdata_properties.xml
 create mode 100644 src/bda/plone/shop/profiles/uninstall/registry.xml

diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 19015c2d..3029f72b 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -209,7 +209,6 @@ class IShopArticleSettings(model.Schema):
         ),
         description=_("help_default_quantity_unit", default="default measurement"),
         vocabulary="bda.plone.shop.vocabularies.QuantityUnitVocabulary",
-        default="quantity",
     )
 
     default_item_net = schema.Decimal(
diff --git a/src/bda/plone/shop/profiles.zcml b/src/bda/plone/shop/profiles.zcml
index b6c53b04..cd7cae80 100644
--- a/src/bda/plone/shop/profiles.zcml
+++ b/src/bda/plone/shop/profiles.zcml
@@ -12,8 +12,16 @@
     description="bda.plone.shop"
     provides="Products.GenericSetup.interfaces.EXTENSION" />
 
-  <!-- Hide profiles/products from Quick Installer -->
+  <genericsetup:registerProfile
+    name="uninstall"
+    title="bda.plone.shop (uninstall)"
+    description="Uninstalls the bda.plone.shop add-on."
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+    directory="profiles/uninstall"
+    post_handler=".setuphandlers.uninstall"
+    />
+
+  <!-- Hide profiles/products from addon manager -->
   <utility factory=".setuphandlers.HiddenProfiles" name="bda.plone.shop" />
-  <utility factory=".setuphandlers.HiddenProducts" name="bda.plone.shop" />
 
 </configure>
diff --git a/src/bda/plone/shop/profiles/uninstall/actions.xml b/src/bda/plone/shop/profiles/uninstall/actions.xml
new file mode 100644
index 00000000..5cf407d2
--- /dev/null
+++ b/src/bda/plone/shop/profiles/uninstall/actions.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<object name="portal_actions"
+        meta_type="Plone Actions Tool"
+        xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+
+  <!-- remove entries -->
+  <object name="object_buttons" meta_type="CMF Action Category">
+    <object name="enableBuyable" meta_type="CMF Action" remove="true" />
+    <object name="disableBuyable" meta_type="CMF Action" remove="true" />
+    <object name="enableVendor" meta_type="CMF Action" remove="true" />
+    <object name="disableVendor" meta_type="CMF Action" remove="true" />
+  </object>
+
+  <object name="user" meta_type="CMF Action Category">
+
+    <!-- reset permissions -->
+    <object name="dashboard" meta_type="CMF Action" i18n:domain="plone">
+      <property name="permissions">
+        <element value="Portlets: Manage own portlets" />
+      </property>
+    </object>
+
+    <object name="preferences" meta_type="CMF Action" i18n:domain="plone">
+      <property name="permissions">
+        <element value="View" />
+      </property>
+    </object>
+
+    <!-- remove -->
+    <object name="information" meta_type="CMF Action" remove="true" />
+
+  </object>
+
+</object>
diff --git a/src/bda/plone/shop/profiles/uninstall/browserlayer.xml b/src/bda/plone/shop/profiles/uninstall/browserlayer.xml
new file mode 100644
index 00000000..7a1bce48
--- /dev/null
+++ b/src/bda/plone/shop/profiles/uninstall/browserlayer.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<layers>
+  <layer
+    name="bda.plone.shop"
+    interface="bda.plone.shop.interfaces.IShopExtensionLayer"
+    remove="true" />
+</layers>
diff --git a/src/bda/plone/shop/profiles/uninstall/catalog.xml b/src/bda/plone/shop/profiles/uninstall/catalog.xml
new file mode 100644
index 00000000..86c7e2cc
--- /dev/null
+++ b/src/bda/plone/shop/profiles/uninstall/catalog.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<object name="portal_catalog" meta_type="Plone Catalog Tool">
+  <index name="item_buyable" meta_type="BooleanIndex" remove="true">
+    <indexed_attr value="item_buyable" />
+  </index>
+ <column value="item_buyable" remove="true" />
+ <column value="item_net" remove="true" />
+ <column value="item_buyable_start" remove="true" />
+ <column value="item_buyable_end" remove="true" />
+</object>
diff --git a/src/bda/plone/shop/profiles/uninstall/controlpanel.xml b/src/bda/plone/shop/profiles/uninstall/controlpanel.xml
new file mode 100644
index 00000000..7d593649
--- /dev/null
+++ b/src/bda/plone/shop/profiles/uninstall/controlpanel.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<object
+    name="portal_controlpanel"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="bda.plone.shop"
+    purge="False">
+
+  <configlet
+    title="Shop settings"
+    action_id="bdashop"
+    appId="bda.plone.shop"
+    category="Products"
+    url_expr="string:${portal_url}/@@shop_controlpanel"
+    icon_expr="string:shop"
+    visible="True"
+    i18n:attributes="title"
+    remove="true">
+    <permission>Manage portal</permission>
+  </configlet>
+
+</object>
diff --git a/src/bda/plone/shop/profiles/uninstall/memberdata_properties.xml b/src/bda/plone/shop/profiles/uninstall/memberdata_properties.xml
new file mode 100644
index 00000000..9a7c64aa
--- /dev/null
+++ b/src/bda/plone/shop/profiles/uninstall/memberdata_properties.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<object name="portal_memberdata" meta_type="Plone Memberdata Tool">
+
+ <!-- 5.2 complains that it shouldn't be remove -->
+ <!-- <property name="fullname" remove="True"></property> -->
+ <!-- <property name="location" remove="True"></property> -->
+
+ <property name="gender" type="string" remove="true"></property>
+ <property name="firstname" type="string" remove="true"></property>
+ <property name="lastname" type="string" remove="true"></property>
+ <property name="phone" type="string" remove="true"></property>
+ <property name="company" type="string" remove="true"></property>
+
+ <property name="street" type="string" remove="true"></property>
+ <property name="zip" type="string" remove="true"></property>
+ <property name="city" type="string" remove="true"></property>
+ <property name="country" type="string" remove="true"></property>
+
+ <property name="delivery_alternative_delivery" type="boolean" remove="true"></property>
+ <property name="delivery_firstname" type="string" remove="true"></property>
+ <property name="delivery_lastname" type="string" remove="true"></property>
+ <property name="delivery_company" type="string" remove="true"></property>
+ <property name="delivery_street" type="string" remove="true"></property>
+ <property name="delivery_zip" type="string" remove="true"></property>
+ <property name="delivery_city" type="string" remove="true"></property>
+ <property name="delivery_country" type="string" remove="true"></property>
+
+</object>
diff --git a/src/bda/plone/shop/profiles/uninstall/registry.xml b/src/bda/plone/shop/profiles/uninstall/registry.xml
new file mode 100644
index 00000000..e990368f
--- /dev/null
+++ b/src/bda/plone/shop/profiles/uninstall/registry.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<registry>
+
+  <records prefix="plone.bundles/bda-plone-shop" interface='Products.CMFPlone.interfaces.IBundleRegistry' remove="true" />
+  <records interface="bda.plone.shop.interfaces.IShopSettings" prefix="plone.shop" remove="true" />
+  <records interface="bda.plone.shop.interfaces.IShopCartSettings" remove="true" />
+  <records interface="bda.plone.shop.interfaces.IShopArticleSettings" remove="true" />
+  <records interface="bda.plone.shop.interfaces.IShopShippingSettings" remove="true" />
+  <records interface="bda.plone.shop.interfaces.IShopTaxSettings" remove="true" />
+  <records interface="bda.plone.shop.interfaces.INotificationTextSettings" remove="true" />
+  <records interface="bda.plone.shop.interfaces.IInvoiceSettings" remove="true" />
+  <records interface="bda.plone.shop.interfaces.IPaymentTextSettings" remove="true" />
+
+</registry>
diff --git a/src/bda/plone/shop/setuphandlers.py b/src/bda/plone/shop/setuphandlers.py
index 02550755..78f29d03 100644
--- a/src/bda/plone/shop/setuphandlers.py
+++ b/src/bda/plone/shop/setuphandlers.py
@@ -2,10 +2,10 @@
 from bda.plone.shop.user.properties import PAS_ID
 from bda.plone.shop.user.properties import UserPropertiesPASPlugin
 from plone import api
-from Products.CMFPlone import interfaces as Plone
-from Products.CMFQuickInstallerTool import interfaces as QuickInstaller
+from plone.base.interfaces import INonInstallable
 from Products.PluggableAuthService.interfaces.plugins import IPropertiesPlugin
 from zope.interface import implementer
+from zope.globalrequest import getRequest
 
 import logging
 
@@ -72,21 +72,37 @@ def install(context):
 
 def uninstall(context):
     """
-    Remove the PAS plugin.
+    Remove dependencies
     """
+    installer = api.content.get_view(
+        name="installer",
+        context=api.portal.get(),
+        request=getRequest(),
+    )
+
+    for dep in [
+        "bda.plone.ajax",
+        "bda.plone.cart",
+        "bda.plone.checkout",
+        "bda.plone.discount",
+        "bda.plone.orders",
+        "bda.plone.payment",
+        "collective.js.datatables",
+        "souper.plone",
+        "yafowil.plone",
+    ]:
+        installer.uninstall_product(dep)
+
     pas = api.portal.get_tool(name="acl_users")
     logger.info(remove_plugin(pas))
 
 
-@implementer(Plone.INonInstallable)
+@implementer(INonInstallable)
 class HiddenProfiles(object):
     def getNonInstallableProfiles(self):
-        """Do not show on Plone's list of installable profiles."""
-        return []
-
+        """Hide uninstall profile from site-creation and quickinstaller."""
+        return ["bda.plone.shop:uninstall"]
 
-@implementer(QuickInstaller.INonInstallable)
-class HiddenProducts(object):
     def getNonInstallableProducts(self):
-        """Do not show on QuickInstaller's list of installable products."""
-        return []
+        """Hide the upgrades package from site-creation and quickinstaller."""
+        return ["bda.plone.shop.upgrades"]
diff --git a/src/bda/plone/shop/vocabularies.py b/src/bda/plone/shop/vocabularies.py
index 52c4f696..33614275 100644
--- a/src/bda/plone/shop/vocabularies.py
+++ b/src/bda/plone/shop/vocabularies.py
@@ -44,7 +44,7 @@ def QuantityUnitVocabulary(context):
     if not settings:
         return
     terms = []
-    for quantity_unit in settings.quantity_units:
+    for quantity_unit in (settings.quantity_units or []):
         terms.append(
             SimpleTerm(
                 value=quantity_unit,
@@ -157,7 +157,7 @@ def AvailableShippingMethodsVocabulary(context):
 def ShippingMethodsVocabulary(context):
     try:
         items = Shippings(context).vocab
-    except KeyError:
+    except (KeyError, TypeError):
         # happens GS profile application if registry entries not present yet
         return AvailableShippingMethodsVocabulary(context)
     return SimpleVocabulary([SimpleTerm(value=k, title=v) for k, v in items])
@@ -166,7 +166,10 @@ def ShippingMethodsVocabulary(context):
 @provider(IVocabularyFactory)
 def AvailablePaymentMethodsVocabulary(context):
     payments = Payments(context).payments
-    items = [(payment.pid, payment.label) for payment in payments]
+    try:
+        items = [(payment.pid, payment.label) for payment in payments]
+    except KeyError:
+        return SimpleVocabulary([])
     return SimpleVocabulary([SimpleTerm(value=k, title=v) for k, v in items])
 
 
@@ -174,7 +177,7 @@ def AvailablePaymentMethodsVocabulary(context):
 def PaymentMethodsVocabulary(context):
     try:
         items = Payments(context).vocab
-    except KeyError:
+    except (KeyError, TypeError):
         # happens GS profile application if registry entries not present yet
         return AvailablePaymentMethodsVocabulary(context)
     return SimpleVocabulary([SimpleTerm(value=k, title=v) for k, v in items])

From 2cac7c88339a6c4c397391bb2e1999356226bcb6 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 11:58:25 +0200
Subject: [PATCH 65/74] hide shop dependency packages from addon controlpanel.
 they install and uninstall now autmatically with this package

---
 src/bda/plone/shop/setuphandlers.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/setuphandlers.py b/src/bda/plone/shop/setuphandlers.py
index 78f29d03..895cea49 100644
--- a/src/bda/plone/shop/setuphandlers.py
+++ b/src/bda/plone/shop/setuphandlers.py
@@ -105,4 +105,11 @@ def getNonInstallableProfiles(self):
 
     def getNonInstallableProducts(self):
         """Hide the upgrades package from site-creation and quickinstaller."""
-        return ["bda.plone.shop.upgrades"]
+        return [
+            "bda.plone.cart",
+            "bda.plone.checkout",
+            "bda.plone.discount",
+            "bda.plone.orders",
+            "bda.plone.payment",
+            "bda.plone.shop.upgrades",
+        ]

From 4e5ff9b5289ef8f65e6aeb50baa8172f7df4f879 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 12:01:53 +0200
Subject: [PATCH 66/74] sort imports

---
 src/bda/plone/shop/setuphandlers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/setuphandlers.py b/src/bda/plone/shop/setuphandlers.py
index 895cea49..9600dbc5 100644
--- a/src/bda/plone/shop/setuphandlers.py
+++ b/src/bda/plone/shop/setuphandlers.py
@@ -4,8 +4,8 @@
 from plone import api
 from plone.base.interfaces import INonInstallable
 from Products.PluggableAuthService.interfaces.plugins import IPropertiesPlugin
-from zope.interface import implementer
 from zope.globalrequest import getRequest
+from zope.interface import implementer
 
 import logging
 

From 9f04bdda4342753affe1bff4c019f0f1450dcf7a Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 12:44:39 +0200
Subject: [PATCH 67/74] Revert "hide shop dependency packages from addon
 controlpanel. they install and uninstall now autmatically with this package"

This reverts commit 2cac7c88339a6c4c397391bb2e1999356226bcb6.
---
 src/bda/plone/shop/setuphandlers.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/bda/plone/shop/setuphandlers.py b/src/bda/plone/shop/setuphandlers.py
index 9600dbc5..b553d180 100644
--- a/src/bda/plone/shop/setuphandlers.py
+++ b/src/bda/plone/shop/setuphandlers.py
@@ -105,11 +105,4 @@ def getNonInstallableProfiles(self):
 
     def getNonInstallableProducts(self):
         """Hide the upgrades package from site-creation and quickinstaller."""
-        return [
-            "bda.plone.cart",
-            "bda.plone.checkout",
-            "bda.plone.discount",
-            "bda.plone.orders",
-            "bda.plone.payment",
-            "bda.plone.shop.upgrades",
-        ]
+        return ["bda.plone.shop.upgrades"]

From 30cae1b7c01aea29a5ca4eee3d205a777533718a Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Wed, 17 Apr 2024 13:23:59 +0200
Subject: [PATCH 68/74] Add test setup

---
 Makefile | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 mx.ini   |  5 +++++
 2 files changed, 51 insertions(+)

diff --git a/Makefile b/Makefile
index 468c41ab..b5d6dd67 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@
 #: core.sources
 #: qa.isort
 #: qa.ruff
+#: qa.test
 #
 # SETTINGS (ALL CHANGES MADE BELOW SETTINGS WILL BE LOST)
 ##############################################################################
@@ -117,6 +118,22 @@ PROJECT_CONFIG?=mx.ini
 # Default: false
 PACKAGES_ALLOW_PRERELEASES?=false
 
+## qa.test
+
+# The command which gets executed. Defaults to the location the
+# :ref:`run-tests` template gets rendered to if configured.
+# Default: .mxmake/files/run-tests.sh
+TEST_COMMAND?=.mxmake/files/run-tests.sh
+
+# Additional Python requirements for running tests to be
+# installed (via pip).
+# Default: pytest
+TEST_REQUIREMENTS?=zope.testrunner
+
+# Additional make targets the test target depends on.
+# No default value.
+TEST_DEPENDENCY_TARGETS?=
+
 ## applications.zope
 
 # cookiecutter configuration file to use
@@ -460,6 +477,35 @@ INSTALL_TARGETS+=packages
 DIRTY_TARGETS+=packages-dirty
 CLEAN_TARGETS+=packages-clean
 
+##############################################################################
+# test
+##############################################################################
+
+TEST_TARGET:=$(SENTINEL_FOLDER)/test.sentinel
+$(TEST_TARGET): $(MXENV_TARGET)
+	@echo "Install $(TEST_REQUIREMENTS)"
+	@$(PYTHON_PACKAGE_COMMAND) install $(TEST_REQUIREMENTS)
+	@touch $(TEST_TARGET)
+
+.PHONY: test
+test: $(FILES_TARGET) $(SOURCES_TARGET) $(PACKAGES_TARGET) $(TEST_TARGET) $(TEST_DEPENDENCY_TARGETS)
+	@test -z "$(TEST_COMMAND)" && echo "No test command defined" && exit 1 || :
+	@echo "Run tests using $(TEST_COMMAND)"
+	@/usr/bin/env bash -c "$(TEST_COMMAND)"
+
+.PHONY: test-dirty
+test-dirty:
+	@rm -f $(TEST_TARGET)
+
+.PHONY: test-clean
+test-clean: test-dirty
+	@test -e $(MXENV_PYTHON) && $(MXENV_PYTHON) -m pip uninstall -y $(TEST_REQUIREMENTS) || :
+	@rm -rf .pytest_cache
+
+INSTALL_TARGETS+=$(TEST_TARGET)
+CLEAN_TARGETS+=test-clean
+DIRTY_TARGETS+=test-dirty
+
 ##############################################################################
 # cookiecutter
 ##############################################################################
diff --git a/mx.ini b/mx.ini
index ea35b207..1748ca76 100644
--- a/mx.ini
+++ b/mx.ini
@@ -25,6 +25,11 @@ version-overrides =
 
 default-install-mode = direct
 
+mxmake-templates = run-tests
+mxmake-test-runner = zope-testrunner
+mxmake-test-path = src
+mxmake-source-path = src/bda.plone.shop
+
 [bda.plone.cart]
 url = ${settings:bda}/bda.plone.cart.git
 pushurl = ${settings:bda_push}/bda.plone.cart.git

From 008c804aadc8b474d671eb4300310dfab3b6cfc0 Mon Sep 17 00:00:00 2001
From: Robert Niederreiter <rnix@squarewave.at>
Date: Wed, 17 Apr 2024 13:33:14 +0200
Subject: [PATCH 69/74] fix main package test source path

---
 mx.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mx.ini b/mx.ini
index 1748ca76..9a953c54 100644
--- a/mx.ini
+++ b/mx.ini
@@ -28,7 +28,7 @@ default-install-mode = direct
 mxmake-templates = run-tests
 mxmake-test-runner = zope-testrunner
 mxmake-test-path = src
-mxmake-source-path = src/bda.plone.shop
+mxmake-source-path = src/bda/plone/shop
 
 [bda.plone.cart]
 url = ${settings:bda}/bda.plone.cart.git

From e2738dffa75fbacbc85caa8794233f3a2e4f4200 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 13:46:22 +0200
Subject: [PATCH 70/74] run tests on GHA

---
 .github/workflows/main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0ee8ed4a..a7615114 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,3 +36,7 @@ jobs:
       - name: Run Lint
         run: |
           make check
+
+      - name: Run Tests
+        run: |
+          make test

From e735613cc971f261f55c448a206cf68bb11cf1fc Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 13:46:30 +0200
Subject: [PATCH 71/74] remove prefix from settings

---
 src/bda/plone/shop/profiles/default/registry.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/profiles/default/registry.xml b/src/bda/plone/shop/profiles/default/registry.xml
index f12f61b5..38d9fc41 100644
--- a/src/bda/plone/shop/profiles/default/registry.xml
+++ b/src/bda/plone/shop/profiles/default/registry.xml
@@ -13,7 +13,7 @@
   <!-- register settings from interfaces.
        Default values are set in the schema in order to keep
        customized settings after an upgrade step -->
-  <records interface="bda.plone.shop.interfaces.IShopSettings" prefix="plone.shop" />
+  <records interface="bda.plone.shop.interfaces.IShopSettings" />
 
   <records interface="bda.plone.shop.interfaces.IShopCartSettings" />
 

From 7c4c357057469f0858c5cd94730e791fbcd42c61 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 13:51:52 +0200
Subject: [PATCH 72/74] shop toolbar menuitem only when browserlayer is
 installed

---
 src/bda/plone/shop/browser/configure.zcml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bda/plone/shop/browser/configure.zcml b/src/bda/plone/shop/browser/configure.zcml
index 7927a46d..c97f8e05 100644
--- a/src/bda/plone/shop/browser/configure.zcml
+++ b/src/bda/plone/shop/browser/configure.zcml
@@ -190,7 +190,7 @@
     class=".toolbar.ShopMenu" />
 
   <adapter
-    for="* *"
+    for="* ..interfaces.IShopExtensionLayer"
     name="shop_toolbar_menu_item"
     factory=".toolbar.ShopSubMenuItem"
     provides="plone.app.contentmenu.interfaces.IContentMenuItem" />

From 02cbc3b2e2941f2614ecc8ee54ecf2e72d73ee9e Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 13:55:21 +0200
Subject: [PATCH 73/74] fix deprecated testmethod

---
 src/bda/plone/shop/tests/test_controlpanel.py | 2 +-
 src/bda/plone/shop/tests/test_dx.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bda/plone/shop/tests/test_controlpanel.py b/src/bda/plone/shop/tests/test_controlpanel.py
index 9155cdae..bb9b0621 100644
--- a/src/bda/plone/shop/tests/test_controlpanel.py
+++ b/src/bda/plone/shop/tests/test_controlpanel.py
@@ -14,4 +14,4 @@ def setUp(self):
         set_browserlayer(self.request)
 
     def test_foo(self):
-        self.assertEquals(1, 1)
+        self.assertEqual(1, 1)
diff --git a/src/bda/plone/shop/tests/test_dx.py b/src/bda/plone/shop/tests/test_dx.py
index c8057489..ef3ba828 100644
--- a/src/bda/plone/shop/tests/test_dx.py
+++ b/src/bda/plone/shop/tests/test_dx.py
@@ -14,4 +14,4 @@ def setUp(self):
         set_browserlayer(self.request)
 
     def test_foo(self):
-        self.assertEquals(1, 1)
+        self.assertEqual(1, 1)

From 6671fdae835be9d46fc2f9142a4e7c9dcf59759f Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 17 Apr 2024 15:19:53 +0200
Subject: [PATCH 74/74] default registry settings on installation

---
 src/bda/plone/shop/browser/configure.zcml |  3 ++-
 src/bda/plone/shop/interfaces.py          |  6 +++++-
 src/bda/plone/shop/setuphandlers.py       | 15 +++++++++++++++
 src/bda/plone/shop/utils.py               | 16 ++++++++--------
 src/bda/plone/shop/vocabularies.py        |  2 +-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/bda/plone/shop/browser/configure.zcml b/src/bda/plone/shop/browser/configure.zcml
index c97f8e05..97e2be6c 100644
--- a/src/bda/plone/shop/browser/configure.zcml
+++ b/src/bda/plone/shop/browser/configure.zcml
@@ -176,7 +176,8 @@
     name="shop_controlpanel"
     for="zope.component.interfaces.ISite"
     class=".controlpanel.ShopSettingsControlPanel"
-    permission="cmf.ManagePortal" />
+    permission="cmf.ManagePortal"
+    layer="..interfaces.IShopExtensionLayer" />
 
   <!-- generic resources -->
   <browser:resourceDirectory
diff --git a/src/bda/plone/shop/interfaces.py b/src/bda/plone/shop/interfaces.py
index 3029f72b..08b756c3 100644
--- a/src/bda/plone/shop/interfaces.py
+++ b/src/bda/plone/shop/interfaces.py
@@ -197,6 +197,7 @@ class IShopArticleSettings(model.Schema):
             default="Quantity units (what the buyable items are measured in)",
         ),
         required=False,
+        default=["quantity"],
         missing_value=set(["quantity"]),
         value_type=schema.Choice(
             vocabulary="bda.plone.shop.vocabularies.AvailableQuantityUnitVocabulary"
@@ -209,6 +210,7 @@ class IShopArticleSettings(model.Schema):
         ),
         description=_("help_default_quantity_unit", default="default measurement"),
         vocabulary="bda.plone.shop.vocabularies.QuantityUnitVocabulary",
+        default="quantity",
     )
 
     default_item_net = schema.Decimal(
@@ -307,6 +309,7 @@ class IShopShippingSettings(model.Schema):
             default="Available shipping methods in checkout",
         ),
         required=True,
+        default=["default_shipping", ],
         min_length=1,
         value_type=schema.Choice(
             vocabulary="bda.plone.shop.vocabularies."
@@ -394,7 +397,7 @@ class IShopTaxSettings(model.Schema):
         title=_("label_vat", default="VAT in %"),
         description=_("help_vat", default="Specify all allowed vat settings"),
         required=False,
-        missing_value=set([0]),
+        default=["0", "20"],
         value_type=schema.Choice(
             vocabulary="bda.plone.shop.vocabularies.AvailableVatVocabulary"
         ),
@@ -646,6 +649,7 @@ class IPaymentTextSettings(model.Schema):
             default="Available payment methods in checkout",
         ),
         required=True,
+        default=["invoice", ],
         min_length=1,
         value_type=schema.Choice(
             vocabulary="bda.plone.shop.vocabularies."
diff --git a/src/bda/plone/shop/setuphandlers.py b/src/bda/plone/shop/setuphandlers.py
index b553d180..522ef053 100644
--- a/src/bda/plone/shop/setuphandlers.py
+++ b/src/bda/plone/shop/setuphandlers.py
@@ -1,6 +1,7 @@
 # -*- coding:utf-8 -*-
 from bda.plone.shop.user.properties import PAS_ID
 from bda.plone.shop.user.properties import UserPropertiesPASPlugin
+from bda.plone.shop.vocabularies import AVAILABLE_VAT_VALUES
 from plone import api
 from plone.base.interfaces import INonInstallable
 from Products.PluggableAuthService.interfaces.plugins import IPropertiesPlugin
@@ -69,6 +70,20 @@ def install(context):
     pas = api.portal.get_tool(name="acl_users")
     logger.info(add_plugin(pas))
 
+    # add sane defaults on installation
+    api.portal.set_registry_record(
+        "bda.plone.shop.interfaces.IShopTaxSettings.vat",
+        AVAILABLE_VAT_VALUES.keys(),
+    )
+    api.portal.set_registry_record(
+        "bda.plone.shop.interfaces.IShopSettings.admin_email",
+        api.portal.get_registry_record("plone.email_from_address", default="")
+    )
+    api.portal.set_registry_record(
+        "bda.plone.shop.interfaces.IShopSettings.admin_name",
+        api.portal.get_registry_record("plone.email_from_name", default="")
+    )
+
 
 def uninstall(context):
     """
diff --git a/src/bda/plone/shop/utils.py b/src/bda/plone/shop/utils.py
index 8850b005..def7d668 100644
--- a/src/bda/plone/shop/utils.py
+++ b/src/bda/plone/shop/utils.py
@@ -20,32 +20,32 @@ def format_amount(val):
 
 
 def get_shop_settings():
-    return getUtility(IRegistry).forInterface(IShopSettings)
+    return getUtility(IRegistry).forInterface(IShopSettings, check=False)
 
 
 def get_shop_tax_settings():
-    return getUtility(IRegistry).forInterface(IShopTaxSettings)
+    return getUtility(IRegistry).forInterface(IShopTaxSettings, check=False)
 
 
 def get_shop_article_settings():
-    return getUtility(IRegistry).forInterface(IShopArticleSettings)
+    return getUtility(IRegistry).forInterface(IShopArticleSettings, check=False)
 
 
 def get_shop_cart_settings():
-    return getUtility(IRegistry).forInterface(IShopCartSettings)
+    return getUtility(IRegistry).forInterface(IShopCartSettings, check=False)
 
 
 def get_shop_shipping_settings():
-    return getUtility(IRegistry).forInterface(IShopShippingSettings)
+    return getUtility(IRegistry).forInterface(IShopShippingSettings, check=False)
 
 
 def get_shop_notification_settings():
-    return getUtility(IRegistry).forInterface(INotificationTextSettings)
+    return getUtility(IRegistry).forInterface(INotificationTextSettings, check=False)
 
 
 def get_shop_invoice_settings():
-    return getUtility(IRegistry).forInterface(IInvoiceSettings)
+    return getUtility(IRegistry).forInterface(IInvoiceSettings, check=False)
 
 
 def get_shop_payment_settings():
-    return getUtility(IRegistry).forInterface(IPaymentTextSettings)
+    return getUtility(IRegistry).forInterface(IPaymentTextSettings, check=False)
diff --git a/src/bda/plone/shop/vocabularies.py b/src/bda/plone/shop/vocabularies.py
index 33614275..b3bb3689 100644
--- a/src/bda/plone/shop/vocabularies.py
+++ b/src/bda/plone/shop/vocabularies.py
@@ -75,7 +75,7 @@ def QuantityUnitVocabulary(context):
 def AvailableVatVocabulary(context):
     # vocab is used in shop settings control panel
     items = list(AVAILABLE_VAT_VALUES.items())
-    items = sorted(items, key=lambda x: x[0])
+    items.sort(key=lambda x: x[0])
     return SimpleVocabulary([SimpleTerm(value=k, title=v) for k, v in items])