Merge branch 'main' of https://github.com/inikoo/aiku into main

inikoo · Jan 3, 2025 · 7206ffd · 7206ffd
2 parents 166efc1 + 6eac525
commit 7206ffd
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/app/Actions/Billables/Service/StoreService.php b/app/Actions/Billables/Service/StoreService.php
@@ -24,7 +24,6 @@
 use App\Models\SysAdmin\Organisation;
 use App\Rules\AlphaDashDot;
 use App\Rules\IUnique;
-use Google\Service\ShoppingContent\ActionReason;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Validation\Rule;

diff --git a/app/Actions/Billables/Service/UI/CreateService.php b/app/Actions/Billables/Service/UI/CreateService.php
@@ -10,7 +10,6 @@
 
 use App\Actions\Fulfilment\UI\Catalogue\Services\IndexFulfilmentServices;
 use App\Actions\OrgAction;
-use App\Enums\Billables\Rental\RentalUnitEnum;
 use App\Enums\Billables\Service\ServiceStateEnum;
 use App\Models\Fulfilment\Fulfilment;
 use App\Models\SysAdmin\Organisation;

diff --git a/app/Actions/Catalogue/Product/UI/CreatePhysicalGoods.php b/app/Actions/Catalogue/Product/UI/CreatePhysicalGoods.php
@@ -10,14 +10,11 @@
 
 use App\Actions\Fulfilment\UI\Catalogue\PhysicalGoods\IndexFulfilmentPhysicalGoods;
 use App\Actions\OrgAction;
-use App\Enums\Billables\Rental\RentalUnitEnum;
-use App\Enums\Catalogue\Product\ProductStateEnum;
 use App\Models\Fulfilment\Fulfilment;
 use App\Models\SysAdmin\Organisation;
 use Inertia\Inertia;
 use Inertia\Response;
 use Lorisleiva\Actions\ActionRequest;
-use Spatie\LaravelOptions\Options;
 
 class CreatePhysicalGoods extends OrgAction
 {

diff --git a/app/Actions/Comms/Traits/WithSendBulkEmails.php b/app/Actions/Comms/Traits/WithSendBulkEmails.php
@@ -48,7 +48,7 @@ private function replaceMergeTags($placeholder, $dispatchedEmail, $unsubscribeUr
         $placeholder = Str::kebab(trim($placeholder));
 
         return match ($placeholder) {
-            'name'        => $dispatchedEmail->getName(),
+            'customer-name' => $dispatchedEmail->recipient->name,
             'unsubscribe' => sprintf(
                 "<a ses:no-track href=\"$unsubscribeUrl\">%s</a>",
                 __('Unsubscribe')