[0.2] Hotfix - fix pluck on null (lunarphp#834)

* fix pluck on null * Update AbstractDiscount.php --------- Co-authored-by: Alec Ritson <hello@itsalec.co.uk>
wychoong · Feb 10, 2023 · 51af420 · 51af420
1 parent 7b5ce85
commit 51af420
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php b/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php
@@ -125,9 +125,6 @@ public function mount()
                 return $this->mapProductToArray($limitation->purchasable);
             });
 
-        $this->selectedBrands = $this->discount->brands->map(fn ($brand) => $this->mapBrandToArray($brand)) ?? collect();
-        $this->selectedCollections = $this->discount->collections->map(fn ($collection) => $this->mapCollectionToArray($collection)) ?? collect();
-
         $this->selectedConditions = $this->discount->purchasableConditions()
             ->wherePurchasableType(Product::class)
             ->pluck('purchasable_id')->values()->toArray();
@@ -329,7 +326,7 @@ public function removeProduct($index)
      */
     public function save()
     {
-        $redirect = ! $this->discount->id;
+        $redirect = !$this->discount->id;
 
         $this->withValidator(function (Validator $validator) {
             $validator->after(function ($validator) {
@@ -353,8 +350,8 @@ public function save()
             $channels = collect($this->availability['channels'])->mapWithKeys(function ($channel) {
                 return [
                     $channel['channel_id'] => [
-                        'starts_at' => ! $channel['enabled'] ? null : $channel['starts_at'],
-                        'ends_at' => ! $channel['enabled'] ? null : $channel['ends_at'],
+                        'starts_at' => !$channel['enabled'] ? null : $channel['starts_at'],
+                        'ends_at' => !$channel['enabled'] ? null : $channel['ends_at'],
                         'enabled' => $channel['enabled'],
                     ],
                 ];

diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php b/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php
@@ -33,6 +33,7 @@ public function mount()
 
         $this->selectedBrands = collect();
         $this->selectedCollections = collect();
+        $this->selectedProducts = collect();
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ public function mount() @@
             $this->selectedBrands = collect();
             $this->selectedCollections = collect();
+            $this->selectedProducts = collect();
         }
         /**
@@ Expand Down @@