Merge pull request #1146 from OFFLINE-GmbH/next

Minor Bugfixes v3.3.1
OFFLINE-GmbH · Jun 5, 2024 · 7de5942 · 7de5942
2 parents 4d2effe + f5db8bd
commit 7de5942
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/components/product/price.htm b/components/product/price.htm
@@ -1,10 +1,10 @@
 {% set price = price|default(item.price()) %}
 
-{% if price.official or item.oldPrice().integer %}
+{% if price.official or item.oldPrice() %}
     <div class="mall-product__old-price">
         {% if price.official %}
             {{ price.official.string|raw }}
-        {% else %}
+        {% elseif item.oldPrice() %}
             {{ item.oldPrice().string|raw }}
         {% endif %}
     </div>

diff --git a/models/CustomerPaymentMethod.php b/models/CustomerPaymentMethod.php
@@ -3,6 +3,7 @@
 namespace OFFLINE\Mall\Models;
 
 use Model;
+use October\Rain\Database\Builder;
 use October\Rain\Database\Traits\SoftDelete;
 use October\Rain\Database\Traits\Validation;
 use OFFLINE\Mall\Classes\Traits\HashIds;

diff --git a/models/Order.php b/models/Order.php
@@ -70,7 +70,6 @@ class Order extends Model
         'customer_payment_method' => [
             CustomerPaymentMethod::class, 
             'deleted'   => true,
-            'scope'     => 'all'
         ],
         'order_state'             => [
             OrderState::class, 

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -572,6 +572,10 @@ v3.2.2:
     - 'Fixed mapWithKeys function call on array when oldPrice has been disabled, thanks to @dathwa (#1118).'
     - 'Fixed backend Order menu breaks on used but disabled payment methods, thanks to @dathwa (#1120).'
 v3.3.0:
-    - "Various Bugfixes"
+    - 'Various Bugfixes'
     - 'Added support for RainLab.User 3.0'
-    - 'Deprecated OFFLINE\Mall\Models\User, use the RainLab.User model instead'
+    - 'Deprecated OFFLINE\Mall\Models\User, use the RainLab.User model instead'
+v3.3.1:
+    - 'Minor Bugfixes'
+    - 'Fixed strict variables issue on oldPrice() attribute, thanks to @dathwa (#1118).'
+    - 'Fixed stripe purchase issue, thanks to @dathwa (#1145).'