diff --git a/components/product/price.htm b/components/product/price.htm index b63b54e24..35cfd4730 100644 --- 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() %}
{% if price.official %} {{ price.official.string|raw }} - {% else %} + {% elseif item.oldPrice() %} {{ item.oldPrice().string|raw }} {% endif %}
diff --git a/models/CustomerPaymentMethod.php b/models/CustomerPaymentMethod.php index b45759999..236abf886 100644 --- 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 index 130e6b91b..f45e70130 100644 --- 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 index e1ca772e5..603f61e2b 100644 --- a/updates/version.yaml +++ b/updates/version.yaml @@ -571,7 +571,11 @@ v3.2.2: - 'Fixed include external assets instead of using a CDN, thanks to @ZhiweiWu0425 (#918).' - '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" +v3.3.0: + - 'Various Bugfixes' - 'Added support for RainLab.User 3.0' - - 'Deprecated OFFLINE\Mall\Models\User, use the RainLab.User model instead' \ No newline at end of file + - '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).' \ No newline at end of file