Release - 2.0-beta15 (#471)

actions-user · actions-user · commit 4109a5425ce1 · 2022-08-10T12:21:38.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+### 2.0-beta15 - 2022-08-10
+
+## Changed
+
+- `savePricing` on the `GetCandy\Hub\Http\Livewire\Traits\HasPrices` trait now supports `basePrices` and `tierPrices` parameters.
+
+## Fixed
+
+- When variants are disabled, editing a product type will not longer display tabs for variant attributes.
+- Fixed an issue where adding a comment to the activity log would error.
+- Comments should now show correctly on product editing pages.
+- Sortable is now attached to the browser window so it's globally available.
+- Fixed an issue where incorrect attributes were showing when changing product types
+- `doctrine/dbal` locked to `3.3.7` due to issue with Sqlite
+
 ### 2.0-beta14 - 2022-08-03
 
 ## Changed
diff --git a/public/app.css b/public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/resources/assets/hub.js b/resources/assets/hub.js
@@ -8,6 +8,7 @@ window.FilePond = require('filepond');
 window.FilePondPluginImagePreview = require('filepond-plugin-image-preview');
 window.FilePondPluginFileValidateSize = require('filepond-plugin-file-validate-size');
 window.FilePondPluginFileValidateType = require('filepond-plugin-file-validate-size');
+window.Sortable = Sortable;
 
 if (typeof window.livewire === 'undefined') {
     throw 'Livewire Sortable Plugin: window.livewire is undefined. Make sure @livewireScripts is placed above this script include';
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
@@ -6,9 +6,7 @@
     <title>{{ $title ?? 'Hub' }} | {{ config('app.name') }}</title>
     <link data-n-head="ssr" rel="icon" type="image/png"  href="https://cdn.getcandy.io/hub/favicon.svg">
 
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Nunito&display=swap" rel="stylesheet">
+    <link href="https://fonts.bunny.net/css2?family=Nunito&display=swap" rel="stylesheet">
     <link href="{{ asset('vendor/getcandy/admin-hub/app.css') }}" rel="stylesheet">
 
     <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.8.2/dist/alpine.min.js" defer></script>
diff --git a/resources/views/partials/attributes.blade.php b/resources/views/partials/attributes.blade.php
@@ -9,7 +9,7 @@
         </header>
         <div class="space-y-4">
           @foreach($group['fields'] as $attIndex => $field)
-            <div wire:key="{{ $field['handle'] }}">
+            <div wire:key="attributes_{{ $field['handle'] }}">
               <x-hub::input.group
                 :label="$field['name']"
                 :for="$field['handle']"
diff --git a/resources/views/partials/forms/product-type.blade.php b/resources/views/partials/forms/product-type.blade.php
@@ -6,20 +6,22 @@
     </div>
 
     <div x-data="{ view: 'products' }">
-      <nav class="flex space-x-4" aria-label="Tabs">
-        <!-- Current: "bg-gray-100 text-gray-700", Default: "text-gray-500 hover:text-gray-700" -->
-        <button type="button" wire:click="$set('view', 'products')" class="px-3 py-3 text-sm font-medium @if($view == 'products') text-gray-800 bg-white @else test-gray-500 hover:text-gray-700 @endif rounded-t">
-            {{ __('adminhub::partials.product-type.product_attributes_btn') }}
-        </button>
+      @if(!$this->variantsDisabled)
+        <nav class="flex space-x-4" aria-label="Tabs">
+          <!-- Current: "bg-gray-100 text-gray-700", Default: "text-gray-500 hover:text-gray-700" -->
+          <button type="button" wire:click="$set('view', 'products')" class="px-3 py-3 text-sm font-medium @if($view == 'products') text-gray-800 bg-white @else test-gray-500 hover:text-gray-700 @endif rounded-t">
+              {{ __('adminhub::partials.product-type.product_attributes_btn') }}
+          </button>
 
-        <button
-          type="button"
-          wire:click="$set('view', 'variants')"
-          class="px-3 py-3 text-sm font-medium @if($view == 'variants') text-gray-800 bg-white @else test-gray-500 hover:text-gray-700 @endif rounded-t"
-        >
-        {{ __('adminhub::partials.product-type.variant_attributes_btn') }}
-        </button>
-      </nav>
+          <button
+            type="button"
+            wire:click="$set('view', 'variants')"
+            class="px-3 py-3 text-sm font-medium @if($view == 'variants') text-gray-800 bg-white @else test-gray-500 hover:text-gray-700 @endif rounded-t"
+          >
+          {{ __('adminhub::partials.product-type.variant_attributes_btn') }}
+          </button>
+        </nav>
+      @endif
 
       <div class="p-6 bg-white rounded-b shadow">
         @if($view == 'products')
diff --git a/src/Base/ActivityLog/Manifest.php b/src/Base/ActivityLog/Manifest.php
@@ -7,6 +7,7 @@
 use GetCandy\Hub\Base\ActivityLog\Orders\Intent;
 use GetCandy\Hub\Base\ActivityLog\Orders\StatusUpdate;
 use GetCandy\Models\Order;
+use GetCandy\Models\Product;
 use Illuminate\Support\Collection;
 
 class Manifest
@@ -24,6 +25,9 @@ class Manifest
             Intent::class,
             EmailNotification::class,
         ],
+        Product::class => [
+            Comment::class,
+        ],
     ];
 
     /**
diff --git a/src/Http/Livewire/Components/ActivityLogFeed.php b/src/Http/Livewire/Components/ActivityLogFeed.php
@@ -3,14 +3,14 @@
 namespace GetCandy\Hub\Http\Livewire\Components;
 
 use GetCandy\Hub\Facades\ActivityLog;
+use GetCandy\Hub\Http\Livewire\Traits\Notifies;
 use Illuminate\Database\Eloquent\Model;
 use Livewire\Component;
 use Livewire\WithPagination;
-use Spatie\Activitylog\Models\Activity;
 
 class ActivityLogFeed extends Component
 {
-    use WithPagination;
+    use WithPagination, Notifies;
 
     /**
      * The log subject to get activity for.
@@ -19,6 +19,46 @@ class ActivityLogFeed extends Component
      */
     public Model $subject;
 
+    /**
+     * The new comment for the subject.
+     *
+     * @var string|null
+     */
+    public ?string $comment = null;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function rules()
+    {
+        return [
+            'comment' => 'string|required',
+        ];
+    }
+
+    /**
+     * Add a comment to the order.
+     *
+     * @return void
+     */
+    public function addComment()
+    {
+        activity()
+            ->performedOn($this->subject)
+            ->causedBy(
+                auth()->user()
+            )
+            ->event('comment')
+            ->withProperties(['content' => $this->comment])
+            ->log('comment');
+
+        $this->notify(
+            __('adminhub::notifications.order.comment_added')
+        );
+
+        $this->comment = null;
+    }
+
     /**
      * Returns the activity log for the order.
      *
diff --git a/src/Http/Livewire/Components/Orders/OrderShow.php b/src/Http/Livewire/Components/Orders/OrderShow.php
@@ -534,29 +534,6 @@ public function getMetaFieldsProperty()
         return (array) $this->order->meta;
     }
 
-    /**
-     * Add a comment to the order.
-     *
-     * @return void
-     */
-    public function addComment()
-    {
-        activity()
-            ->performedOn($this->order)
-            ->causedBy(
-                auth()->user()
-            )
-            ->event('comment')
-            ->withProperties(['content' => $this->comment])
-            ->log('comment');
-
-        $this->notify(
-            __('adminhub::notifications.order.comment_added')
-        );
-
-        $this->comment = '';
-    }
-
     /**
      * Render the livewire component.
      *
diff --git a/src/Http/Livewire/Components/Products/ProductTypes/AbstractProductType.php b/src/Http/Livewire/Components/Products/ProductTypes/AbstractProductType.php
@@ -85,6 +85,16 @@ public function updatedAttributeSearch()
         $this->resetPage();
     }
 
+    /**
+     * Return whether variants are disabled.
+     *
+     * @return bool
+     */
+    public function getVariantsDisabledProperty()
+    {
+        return config('getcandy-hub.products.disable_variants', false);
+    }
+
     /**
      * Return attributes for a group.
      *
diff --git a/src/Http/Livewire/Traits/HasPrices.php b/src/Http/Livewire/Traits/HasPrices.php
@@ -84,24 +84,26 @@ public function mountHasPrices()
     }
 
     /**
-     * Method to save pricing.
+     * Save pricing.
      *
+     * @param  Collection|null  $basePrices
+     * @param  Collecton|null  $tierPrices
      * @return void
      */
-    public function savePricing()
+    public function savePricing(Collection $basePrices = null, Collection $tierPrices = null)
     {
         $model = $this->getPricedModel();
 
-        DB::transaction(function () use ($model) {
+        DB::transaction(function () use ($model, $basePrices) {
             app(UpdatePrices::class)->execute(
                 $model,
-                $this->basePrices
+                $basePrices ?: $this->basePrices
             );
         });
 
         $this->tieredPrices = app(UpdateTieredPricing::class)->execute(
             $model,
-            $this->tieredPrices
+            $tierPrices ?: $this->tieredPrices
         );
 
         DB::transaction(function () use ($model) {
diff --git a/src/Http/Livewire/Traits/WithAttributes.php b/src/Http/Livewire/Traits/WithAttributes.php
@@ -36,6 +36,12 @@ public function mountWithAttributes()
     public function updatedProductProductTypeId()
     {
         $this->mapAttributes();
+
+        $this->variantAttributes = $this->parseAttributes(
+            $this->availableVariantAttributes,
+            $this->variantAttributes,
+            'variantAttributes',
+        );
     }
 
     protected function mapAttributes()
diff --git a/tests/Unit/Http/Livewire/Components/ActivityLogFeedTest.php b/tests/Unit/Http/Livewire/Components/ActivityLogFeedTest.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace GetCandy\Hub\Tests\Unit\Http\Livewire\Components;
+
+use GetCandy\Hub\Http\Livewire\Components\ActivityLogFeed;
+use GetCandy\Hub\Models\Staff;
+use GetCandy\Hub\Tests\TestCase;
+use GetCandy\Models\Currency;
+use GetCandy\Models\Language;
+use GetCandy\Models\Order;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+use Spatie\Activitylog\Models\Activity;
+
+/**
+ * @group hub.activity-log
+ */
+class ActivityLogFeedTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Language::factory()->create([
+            'default' => true,
+            'code'    => 'en',
+        ]);
+
+        Currency::factory()->create([
+            'default'        => true,
+            'decimal_places' => 2,
+        ]);
+    }
+
+    /** @test */
+    public function can_mount_component()
+    {
+        $order = Order::factory()->create([
+            'user_id'   => null,
+            'placed_at' => now(),
+            'status' => 'awaiting-payment',
+            'currency_code' => Currency::getDefault()->code,
+            'meta'      => [
+                'foo' => 'bar',
+            ],
+            'tax_breakdown' => [
+                ['description' => 'VAT', 'percentage' => 20, 'total' => 200],
+            ],
+        ]);
+
+        $staff = Staff::factory()->create([
+            'admin' => true,
+        ]);
+
+        Livewire::actingAs($staff, 'staff')->test(ActivityLogFeed::class, [
+            'subject' => $order,
+        ]);
+    }
+
+    /** @test */
+    public function can_add_comment()
+    {
+        $order = Order::factory()->create([
+            'user_id'   => null,
+            'placed_at' => now(),
+            'status' => 'awaiting-payment',
+            'currency_code' => Currency::getDefault()->code,
+            'meta'      => [
+                'foo' => 'bar',
+            ],
+            'tax_breakdown' => [
+                ['description' => 'VAT', 'percentage' => 20, 'total' => 200],
+            ],
+        ]);
+
+        $staff = Staff::factory()->create([
+            'admin' => true,
+        ]);
+
+        Livewire::actingAs($staff, 'staff')->test(ActivityLogFeed::class, [
+            'subject' => $order,
+        ])->set('comment', 'Testing 123')
+            ->call('addComment')
+            ->assertHasNoErrors()
+            ->assertSet('comment', null)
+            ->assertSee('Testing 123');
+
+        $this->assertDatabaseHas((new Activity())->getTable(), [
+            'event' => 'comment',
+            'subject_id' => $order->id,
+            'subject_type' => Order::class,
+            'causer_id' => $staff->id,
+            'properties' => json_encode([
+                'content' => 'Testing 123',
+            ]),
+        ]);
+    }
+}
diff --git a/tests/Unit/Http/Livewire/Components/Orders/OrderShowTest.php b/tests/Unit/Http/Livewire/Components/Orders/OrderShowTest.php
diff --git a/tests/Unit/Http/Livewire/Traits/HasPricesTest.php b/tests/Unit/Http/Livewire/Traits/HasPricesTest.php
