[FIX] Disabled oldPrice issue, #1118

.gitignore

@@ -4,8 +4,8 @@
 .phpunit.result.cache
 .vscode
 composer.lock
-docs/.vitepress/cache
-docs/.vitepress/dist
+src/docs/.vitepress/cache
+src/docs/.vitepress/dist
 nbproject
 node_modules
 vendor

classes/traits/PriceAccessors.php

@@ -1,5 +1,4 @@
-<?php
-
+<?php declare(strict_types=1);
 
 namespace OFFLINE\Mall\Classes\Traits;
 
@@ -15,6 +14,7 @@
 trait PriceAccessors
 {
     use NullPrice;
+
     /**
      * @var Money
      */

classes/traits/ProductPriceAccessors.php

@@ -1,70 +1,93 @@
-<?php
-
+<?php declare(strict_types=1);
 
 namespace OFFLINE\Mall\Classes\Traits;
 
+use October\Rain\Database\Collection;
 use OFFLINE\Mall\Models\Currency;
 use OFFLINE\Mall\Models\CustomerGroup;
 use OFFLINE\Mall\Models\PriceCategory;
 
 trait ProductPriceAccessors
 {
+    /**
+     * Undocumented function
+     * @param CustomerGroup $group
+     * @param mixed $currency
+     * @return mixed
+     */
     public function groupPrice(CustomerGroup $group, $currency)
     {
         $currency = Currency::resolve($currency);
-
         $prices = $this->customer_group_prices;
-
         $filter = function ($query) use ($group) {
             return $query->where('customer_group_id', $group->id);
         };
 
         $price = $this->withFilter($filter, $prices->where('currency_id', $currency->id))->first();
-
-        return $price
-            ?? $this->nullPrice(
+        if ($price) {
+            return $price;
+        } else {
+            return $this->nullPrice(
                 $currency,
                 $this->withFilter($filter, $prices),
                 'customer_group_prices',
                 $filter
             );
+        }
     }
 
+    /**
+     * Undocumented function
+     * @param int|PriceCategory $category
+     * @param mixed $currency
+     * @return mixed
+     */
     public function additionalPrice($category, $currency = null)
     {
-        $currency = Currency::resolve($currency);
-
-        $prices = $this->additional_prices;
-
         if ($category instanceof PriceCategory) {
             $category = $category->id;
         }
 
+        $currency = Currency::resolve($currency);
+        $prices = $this->additional_prices;
         $filter = function ($query) use ($category) {
             return $query->where('price_category_id', $category);
         };
 
-        $query = $this->withFilter($filter, $prices->where('currency_id', $currency->id));
-
-        return $query->first()
-            ?? $this->nullPrice(
+        $price = $this->withFilter($filter, $prices->where('currency_id', $currency->id))->first();
+        if ($price) {
+            return $price;
+        } else {
+            return $this->nullPrice(
                 $currency,
                 $this->withFilter($filter, $prices),
                 'additional_prices',
                 $filter
             );
+        }
     }
 
+    /**
+     * Undocumented function
+     * @deprecated 3.2.2 - The oldPrice category has been made optional.
+     * @return mixed
+     */
     public function oldPriceRelations()
     {
         $oldPrice = PriceCategory::where('code', 'old_price')->first();
         if ($oldPrice) {
             return $this->additional_prices->where('price_category_id', $oldPrice->id);
         } else {
-            return [];
+            return new Collection();
         }
     }
 
+    /**
+     * Undocumented function
+     * @deprecated 3.2.2 - The oldPrice category has been made optional.
+     * @param mixed $currency
+     * @return mixed
+     */
     public function oldPrice($currency = null)
     {
         $oldPrice = PriceCategory::where('code', 'old_price')->first();
@@ -74,14 +97,29 @@ public function oldPrice($currency = null)
             return null;
         }
     }
-
+
+    /**
+     * Undocumented function
+     * @deprecated 3.2.2 - The oldPrice category has been made optional.
+     * @return mixed
+     */
     public function getOldPriceAttribute()
     {
         return $this->mapCurrencyPrices($this->oldPriceRelations());
     }
 
-    public function getOnSaleAttribute()
+    /**
+     * Undocumented function
+     * @deprecated 3.2.2 - The oldPrice category has been made optional.
+     * @return boolean
+     */
+    public function getOnSaleAttribute(): bool
     {
-        return $this->old_price->count() > 0;
+        $price = $this->old_price;
+        if ($price && $price->count() > 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 }

updates/version.yaml

@@ -560,4 +560,7 @@ v3.2.0:
     - 030_07-alter_offline_mall_order_states.php
     - 030_08-create_offline_mall_product_file_variant_table.php
 v3.2.1:
-    - 'Fix Release Number'
+    - 'Fix Release Number'
+v3.2.2:
+    - 'Minor Bugfix'
+    - 'Fixed mapWithKeys() on array call when oldPrice has been disabled, thanks to @dathwa (#1118).'