update container resolution

lunarphp · Sep 4, 2024 · 48e8f96 · 48e8f96
1 parent f7d1722
commit 48e8f96
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/packages/core/src/Base/OrderReferenceGenerator.php b/packages/core/src/Base/OrderReferenceGenerator.php
@@ -3,20 +3,22 @@
 namespace Lunar\Base;
 
 use Lunar\Facades\DB;
+use Lunar\Models\Contracts\Order as OrderContract;
 use Lunar\Models\Order;
 
 class OrderReferenceGenerator implements OrderReferenceGeneratorInterface
 {
     /**
      * {@inheritDoc}
      */
-    public function generate(Order $order): string
+    public function generate(OrderContract $order): string
     {
+        /** @var Order $order */
         $year = $order->created_at->year;
 
         $month = $order->created_at->format('m');
 
-        $latest = Order::select(
+        $latest = Order::modelClass()::select(
             DB::RAW('MAX(reference) as reference')
         )->whereYear('created_at', '=', $year)
             ->whereMonth('created_at', '=', $month)

diff --git a/packages/stripe/src/Actions/StoreAddressInformation.php b/packages/stripe/src/Actions/StoreAddressInformation.php
@@ -2,6 +2,7 @@
 
 namespace Lunar\Stripe\Actions;
 
+use Lunar\Models\Contracts\Order as OrderContract;
 use Lunar\Models\Country;
 use Lunar\Models\Order;
 use Lunar\Models\OrderAddress;
@@ -10,8 +11,9 @@
 
 class StoreAddressInformation
 {
-    public function store(Order $order, PaymentIntent $paymentIntent)
+    public function store(OrderContract $order, PaymentIntent $paymentIntent)
     {
+        /** @var Order $order */
         $billingAddress = $order->billingAddress ?: new OrderAddress([
             'order_id' => $order->id,
             'type' => 'billing',
@@ -25,7 +27,7 @@ public function store(Order $order, PaymentIntent $paymentIntent)
         $paymentMethod = Stripe::getPaymentMethod($paymentIntent->payment_method);
 
         if ($paymentIntent->shipping && $stripeShipping = $paymentIntent->shipping->address) {
-            $country = Country::where('iso2', $stripeShipping->country)->first();
+            $country = Country::modelClass()::where('iso2', $stripeShipping->country)->first();
             $shippingAddress->first_name = explode(' ', $paymentIntent->shipping->name)[0];
             $shippingAddress->last_name = explode(' ', $paymentIntent->shipping->name)[1] ?? '';
             $shippingAddress->line_one = $stripeShipping->line1;
@@ -39,7 +41,7 @@ public function store(Order $order, PaymentIntent $paymentIntent)
         }
 
         if ($paymentMethod && $stripeBilling = $paymentMethod->billing_details?->address) {
-            $country = Country::where('iso2', $stripeBilling->country)->first();
+            $country = Country::modelClass()::where('iso2', $stripeBilling->country)->first();
             $billingAddress->first_name = explode(' ', $paymentMethod->billing_details->name)[0];
             $billingAddress->last_name = explode(' ', $paymentMethod->billing_details->name)[1] ?? '';
             $billingAddress->line_one = $stripeBilling->line1;

diff --git a/packages/stripe/src/Jobs/ProcessStripeWebhook.php b/packages/stripe/src/Jobs/ProcessStripeWebhook.php
@@ -40,15 +40,15 @@ public function handle()
         $order = null;
 
         if ($this->orderId) {
-            $order = Order::find($this->orderId);
+            $order = Order::modelClass()::find($this->orderId);
 
             if ($order->placed_at) {
                 return;
             }
         }
 
         if (! $order) {
-            $cart = Cart::where('meta->payment_intent', '=', $this->paymentIntentId)->first();
+            $cart = Cart::modelClass()::where('meta->payment_intent', '=', $this->paymentIntentId)->first();
         }
 
         if (! $cart && ! $order) {

diff --git a/tests/core/Unit/Models/ProductOptionTest.php b/tests/core/Unit/Models/ProductOptionTest.php
@@ -58,7 +58,7 @@
     $productOption = ProductOption::factory()->create();
     $this->assertDatabaseCount((new ProductOption)->getTable(), 1);
 
-    ProductOption::where('handle', $productOption->handle)->delete();
+    ProductOption::modelClass()::where('handle', $productOption->handle)->delete();
     $this->assertDatabaseCount((new ProductOption)->getTable(), 0);
 });
 
@@ -74,7 +74,7 @@
     ]);
 
     $this->assertDatabaseCount((new ProductOptionValue)->getTable(), 1);
-    expect(ProductOptionValue::whereRelation(
+    expect(ProductOptionValue::modelClass()::whereRelation(
         'option',
         'product_option_id',
         $productOption->id)->get())->toHaveCount(1);