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

inikoo · Oct 4, 2024 · 7d787e1 · 7d787e1
2 parents fb6d952 + 3a7ff29
commit 7d787e1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/app/Actions/CRM/Customer/DeleteCustomerDeliveryAddress.php b/app/Actions/CRM/Customer/DeleteCustomerDeliveryAddress.php
@@ -24,13 +24,15 @@
 class DeleteCustomerDeliveryAddress extends OrgAction
 {
     protected Address $address;
-    public function handle(Customer $customer, Address $address)
+    public function handle(Customer $customer, Address $address): Customer
     {
         $customer->addresses()->detach($address->id);
 
-        $address->delete();
-
         AddressHydrateUsage::dispatch($address);
+
+        $address->delete();
+
+        $customer->refresh();
         return $customer;
     }
 
@@ -50,6 +52,13 @@ public function asController(FulfilmentCustomer $fulfilmentCustomer, Address $ad
         $this->handle($fulfilmentCustomer->customer, $address);
     }
 
+    public function action(Customer $customer, Address $address): Customer
+    {
+        $this->address = $address;
+        $this->initialisationFromShop($customer->shop, []);
+        return $this->handle($customer, $address);
+    }
+
     public function inCustomer(Customer $customer, Address $address, ActionRequest $request): void
     {
         $this->address = $address;

diff --git a/tests/Feature/CrmTest.php b/tests/Feature/CrmTest.php
@@ -6,6 +6,7 @@
  */
 
 use App\Actions\CRM\Customer\AddDeliveryAddressToCustomer;
+use App\Actions\CRM\Customer\DeleteCustomerDeliveryAddress;
 use App\Actions\CRM\Customer\HydrateCustomers;
 use App\Actions\CRM\Customer\StoreCustomer;
 use App\Actions\CRM\Prospect\StoreProspect;
@@ -192,8 +193,20 @@
 
     expect($customer)->toBeInstanceOf(Customer::class)
     ->and($customer->addresses->count())->toBe(2);
+
+    return $customer;
 })->depends('create customer');
 
+test('delete delivery address from customer', function (Customer $customer) {
+    $address = $customer->addresses()->skip(1)->first();
+    $customer = DeleteCustomerDeliveryAddress::make()->action($customer, $address);
+
+    expect($customer)->toBeInstanceOf(Customer::class)
+    ->and($customer->addresses->count())->toBe(1);
+
+    return $customer;
+})->depends('add delivery address to customer');
+
 test('can show list of prospects lists', function () {
     $shop     = $this->shop;
     $response = get(route('grp.org.shops.show.crm.prospects.lists.index', [$shop->slug]));