Merge remote-tracking branch 'origin/master' into bootstrap-plone6

CHANGES.rst

@@ -16,6 +16,13 @@ Changelog
 - Use Decimal for shipping and article defaults.
   [agitator]
 
+- Fix availability details pop-up
+  [petri]
+
+- Refactor buyable.[py|pt] for localized number output and better Decimal usage.
+  Also use Python expressions for performance.
+  [jensens]
+
 - Use Decimal field for net price and cast to Decimal (for old values) in accessor.
   [jensens]
 
@@ -52,6 +59,12 @@ Changelog
 - Update version and classifiers - 2.x targets Plone 5.1/5.2 without Archetypes
   [agitator]
 
+- Italian translations
+  [ale-rt]
+
+- migration: fixed an edgecase when upgrading old shop installations
+  [petschki]
+
 
 1.0a1 (unreleased)
 ------------------

src/bda/plone/shop/browser/availability.py

@@ -14,6 +14,7 @@
 class CartItemAvailability(CartItemAvailabilityBase):
     details_template = ViewPageTemplateFile("availability_details.pt")
 
+    @property
     def details(self):
         return self.details_template(self)
 

src/bda/plone/shop/browser/buyable.pt

@@ -5,7 +5,7 @@
      ajax:bind="cart_changed"
      tal:define="addable view/item_addable;
                  css string:cart_item_${context/UID}"
-     tal:attributes="ajax:target context/absolute_url;
+     tal:attributes="ajax:target python:context.absolute_url();
                      ajax:action string:buyable_controls:.${css}:replace;
                      class string:buyable viewlet ${css}">
 
@@ -18,7 +18,7 @@
            
         </div>
         <div class="availability_details"
-             tal:content="structure view/availability_details">
+             tal:content="structure python:view.availability_details">
           deliverable until 1.1.2013
         </div>
       </div>
@@ -105,9 +105,8 @@
         </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;">${view/item_uid}</span>
 
         <tal:addable condition="addable">
         <div class="add-to-cart-group input-group mb-2 me-2">

src/bda/plone/shop/browser/buyable.py

@@ -74,16 +74,20 @@ def currency(self):
             return CURRENCY_LITERALS[currency]
         return ""
 
+    def format_number_localized(self, value, quantizer=None):
+        formatter = self.request.locale.numbers.getFormatter('decimal')
+        formatter.type = Decimal
+        if quantizer is not None:
+            value = value.quantize(Decimal(quantizer))
+        return formatter.format(value)
+
     @property
     def item_uid(self):
         return IUUID(self.context)
 
     @property
     def item_vat(self):
-        vat = self._item_data.vat
-        if vat % 2 != 0:
-            return Decimal(vat).quantize(Decimal("1.0"))
-        return Decimal(vat)
+        return Decimal(self._item_data.vat)
 
     @property
     def item_net_original(self):

src/bda/plone/shop/i18n.sh

@@ -26,8 +26,7 @@ done
 
 # Assume i18ndude is installed with buildout
 # and this script is run under src/ folder with two nested namespaces in the package name (like collective.bla)
-#I18NDUDE=../../../../bin/i18ndude
-I18NDUDE=../../../../../../bin/i18ndude
+I18NDUDE=$(which i18ndude || ../../../../../../bin/i18ndude)
 
 if test ! -e $I18NDUDE; then
         echo "You must install i18ndude with buildout"