Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/Stache/Repositories/OrderRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use DuncanMcClean\Cargo\Contracts\Orders\Order;
use DuncanMcClean\Cargo\Contracts\Orders\OrderRepository as RepositoryContract;
use DuncanMcClean\Cargo\Contracts\Orders\QueryBuilder;
use DuncanMcClean\Cargo\Customers\GuestCustomer;
use DuncanMcClean\Cargo\Exceptions\OrderNotFound;
use DuncanMcClean\Cargo\Orders\Blueprint;
use Illuminate\Support\Carbon;
Expand Down Expand Up @@ -57,6 +58,18 @@ public function make(): Order

public function makeFromCart(Cart $cart): Order
{
$data = $cart->data();

if ($cart->customer() && ! $cart->customer() instanceof GuestCustomer) {
$hasExistingOrders = $this->query()
->where('customer', $cart->customer()->getKey())
->exists();

if (! $hasExistingOrders) {
$data->put('new_customer', true);
}
}

return self::make()
->cart($cart->id())
->site($cart->site())
Expand All @@ -67,7 +80,7 @@ public function makeFromCart(Cart $cart): Order
->discountTotal($cart->discountTotal())
->taxTotal($cart->taxTotal())
->shippingTotal($cart->shippingTotal())
->data($cart->data()->toArray());
->data($data->toArray());
}

public function save(Order $order): void
Expand Down
28 changes: 28 additions & 0 deletions tests/Orders/MakeOrderFromCartTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use PHPUnit\Framework\Attributes\Test;
use Statamic\Facades\Collection;
use Statamic\Facades\Entry;
use Statamic\Facades\User;
use Statamic\Testing\Concerns\PreventsSavingStacheItemsToDisk;
use Tests\TestCase;

Expand Down Expand Up @@ -68,4 +69,31 @@ public function it_can_make_an_order_from_a_cart()
'status' => 'payment_pending',
], $order->fileData());
}

#[Test]
public function it_adds_the_new_customer_flag_when_its_the_customers_first_order()
{
$user = User::make()->id('user-123')->email('[email protected]')->save();

$cart = Cart::make()->customer($user);

$order = Order::makeFromCart($cart);

$this->assertEquals('user-123', $order->customer()->id());
$this->assertEquals(true, $order->get('new_customer'));
}

#[Test]
public function it_doesnt_add_the_new_customer_flag_when_the_customer_has_past_orders()
{
$user = User::make()->id('user-123')->email('[email protected]')->save();
Order::make()->customer($user)->save();

$cart = Cart::make()->customer($user);

$order = Order::makeFromCart($cart);

$this->assertEquals('user-123', $order->customer()->id());
$this->assertNull($order->get('new_customer'));
}
}