Merge pull request #208 from xxl4/develop

Develop
xxl4 · May 7, 2024 · 5e36b31 · 5e36b31
2 parents 551434f + b3f63ee
commit 5e36b31
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 28 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -4,8 +4,6 @@
 
 use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Illuminate\Support\Facades\Log;
 
 class Handler extends ExceptionHandler
 {
@@ -37,7 +35,7 @@ class Handler extends ExceptionHandler
     public function report(Throwable $exception)
     {
 
-        if ($exception instanceof \HttpException) {
+        if ($exception instanceof \Exception) {
             $message = $exception->getMessage();
             if(!empty($message)) {
                 $pos = strpos($message, "bagisto");

diff --git a/packages/Webkul/Paypal/src/Helpers/Ipn.php b/packages/Webkul/Paypal/src/Helpers/Ipn.php
@@ -53,6 +53,8 @@ public function processIpn($post)
 
         Log::info("ipn post".json_encode($this->post));
 
+        if(empty($this->post)) return; //
+
         if (! $this->postBack()) {
             return;
         }

diff --git a/packages/Webkul/Shop/src/Resources/views/components/layouts/header/desktop/top.blade.php b/packages/Webkul/Shop/src/Resources/views/components/layouts/header/desktop/top.blade.php
@@ -25,16 +25,7 @@
         <x-slot:toggle>
             {{-- Dropdown Toggler --}}
             <div class="flex items-center gap-[10px] cursor-pointer">
-                <img 
-                    src="{{ ! empty(core()->getCurrentLocale()->logo_url) 
-                            ? core()->getCurrentLocale()->logo_url 
-                            : bagisto_asset('images/default-language.svg') 
-                        }}"
-                    class="h-full"
-                    alt="Default locale"
-                    width="24"
-                    height="16"
-                />
+
 
                 <span>
                     {{ core()->getCurrentChannel()->locales()->orderBy('name')->where('code', app()->getLocale())->value('name') }}
@@ -73,11 +64,7 @@ class="flex items-center gap-[10px] px-5 py-2 text-[16px] cursor-pointer hover:b
                 :class="{'bg-gray-100': locale.code == '{{ app()->getLocale() }}'}"
                 @click="change(locale)"                  
             >
-                <img
-                    :src="locale.logo_url || '{{ bagisto_asset('images/default-language.svg') }}'"
-                    width="24"
-                    height="16"
-                />
+
 
                 @{{ locale.name }}
             </span>

diff --git a/packages/Webkul/Shop/src/Resources/views/components/layouts/header/mobile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/components/layouts/header/mobile/index.blade.php
@@ -90,16 +90,7 @@ class="flex text-[16px] font-medium"
                             <x-slot:toggle>
                                 {{-- Dropdown Toggler --}}
                                 <div class="w-full flex gap-[10px] justify-between items-center cursor-pointer">
-                                    <img
-                                        src="{{ ! empty(core()->getCurrentLocale()->logo_url)
-                                                ? core()->getCurrentLocale()->logo_url
-                                                : bagisto_asset('images/default-language.svg')
-                                            }}"
-                                        class="h-full"
-                                        alt="Default locale"
-                                        width="24"
-                                        height="16"
-                                    />
+
 
                                     <span>
                                         {{ core()->getCurrentChannel()->locales()->orderBy('name')->where('code', app()->getLocale())->value('name') }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,8 @@ public function processIpn($post) @@
             Log::info("ipn post".json_encode($this->post));
+            if(empty($this->post)) return; //
             if (! $this->postBack()) {
                 return;
             }
@@ Expand Down @@