Merge pull request #16 from dystcz/fix/fix-finding-order

Fix finding order
dystcz · Nov 25, 2024 · c959e97 · c959e97
2 parents 303df54 + 5d2a514
commit c959e97
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.env.testing.example b/.env.testing.example
@@ -7,11 +7,15 @@ APP_URL=http://localhost
 DB_CONNECTION="sqlite"
 DB_DATABASE=":memory:"
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=
+QUEUE_CONNECTION=sync
+CACHE_DRIVER=array
+
+REDIS_CLIENT=phpredis
+REDIS_HOST=localhost
+REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-PAYMENTS_TYPE=stripe
+PAYMENT_DRIVER=stripe
 
 STRIPE_PUBLIC_KEY=pk_test_
 STRIPE_SECRET_KEY=sk_test_

diff --git a/src/Actions/AuthorizeStripePayment.php b/src/Actions/AuthorizeStripePayment.php
@@ -6,8 +6,8 @@
 use Dystcz\LunarApi\Domain\Payments\Contracts\PaymentIntent;
 use Lunar\Base\DataTransferObjects\PaymentAuthorize;
 use Lunar\Facades\Payments;
-use Lunar\Models\Cart;
-use Lunar\Models\Order;
+use Lunar\Models\Contracts\Cart;
+use Lunar\Models\Contracts\Order;
 
 class AuthorizeStripePayment
 {

diff --git a/src/Jobs/Webhooks/WebhookHandler.php b/src/Jobs/Webhooks/WebhookHandler.php
@@ -16,7 +16,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
-use Lunar\Models\Order;
+use Lunar\Models\Contracts\Order;
 use Spatie\WebhookClient\Models\WebhookCall;
 use Stripe\Event;
 use Throwable;
@@ -82,23 +82,23 @@ protected function findOrder(PaymentIntentContract $paymentIntent): Order
 
             return $order;
         } catch (Throwable $e) {
-            $this->fail($e);
+            // $this->fail($e);
         }
 
         try {
             $order = App::make(FindOrderByTransaction::class)($paymentIntent);
 
             return $order;
         } catch (Throwable $e) {
-            $this->fail($e);
+            // $this->fail($e);
         }
 
         try {
             $order = App::make(FindOrderByCartIntent::class)($paymentIntent);
 
             return $order;
         } catch (Throwable $e) {
-            $this->fail($e);
+            // $this->fail($e);
         }
 
         $this->fail(new ModelNotFoundException('Order not found.'));