Attendize · quentincaffeino · Sep 11, 2021 · Sep 12, 2021 · Sep 12, 2021 · Sep 12, 2021
diff --git a/.env.example b/.env.example
@@ -6,6 +6,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=https://localhost:8081
+PUBLIC_URL=
 
 LOG_CHANNEL=stack
 

diff --git a/app/Helpers/app_url.php b/app/Helpers/app_url.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+if (!function_exists('app_url')) {
+    /**
+     * Generate an absolute URL to the given path.
+     *
+     * @param  string  $path
+     * @param  mixed  $extra
+     * @param  bool|null  $secure
+     * @return string
+     */
+    function app_url($path, $extra = [], $secure = null)
+    {
+        $urlGenerator = app('url');
+        $appUrl = env('APP_URL', '');
+
+        if (isset($appUrl) && $appUrl !== '') {
+            $parsedPath = parse_url($path);
+            $parsedAppUrl = parse_url($appUrl);
+
+            if ($parsedAppUrl) {
+                $parsedPath['host'] = $parsedAppUrl['host'];
+                $parsedPath['port'] = isset($parsedAppUrl['port']) ? $parsedAppUrl['port'] : null;
+            } else {
+                $parsedPath['host'] = $appUrl;
+                $parsedPath['port'] = null;
+            }
+
+            // Temporary replace default app domain with public domain
+            $urlGenerator->forceRootUrl($parsedPath['host']);
+
+            $path = unparse_url($parsedPath);
+        }
+
+        // Generate public url string
+        $result = $urlGenerator->to($path, $extra, $secure);
+
+        if (isset($appUrl) && $appUrl !== '') {
+            // Reset domain to default value
+            $urlGenerator->forceRootUrl('');
+        }
+
+        return $result;
+    }
+}
diff --git a/app/Helpers/public_route.php b/app/Helpers/public_route.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+if (!function_exists('public_route')) {
+    /**
+     * Generate the URL to a named route.
+     *
+     * @param  array|string  $name
+     * @param  mixed  $parameters
+     * @param  bool  $absolute
+     * @return string
+     */
+    function public_route($name, $parameters = [], $absolute = true)
+    {
+        $urlGenerator = app('url');
+
+        if (!$absolute) {
+            return $urlGenerator->route($name, $parameters, $absolute);
+        }
+
+        $appUrl = env('APP_URL', $urlGenerator->getRequest()->root());
+        $publicUrl = env('PUBLIC_URL', '');
+
+        if (isset($publicUrl) && $publicUrl !== '') {
+            // Temporary replace default app domain with public domain
+            $route = Route::getRoutes()->getByName($name)->domain($publicUrl);
+            // Generate public url string
+            $result = $urlGenerator->toRoute($route, $parameters, true);
+            // Set domain to default value
+            $route = Route::getRoutes()->getByName($name)->domain($appUrl);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/Helpers/unparse_url.php b/app/Helpers/unparse_url.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+if (!function_exists('unparse_url')) {
+    /**
+     * @param  array  $parsedUrl
+     * @return string
+     */
+    function unparse_url($parsedUrl)
+    {
+        $scheme   = isset($parsedUrl['scheme']) ? $parsedUrl['scheme'] . '://' : '';
+        $host     = isset($parsedUrl['host']) ? $parsedUrl['host'] : '';
+        $port     = isset($parsedUrl['port']) ? ':' . $parsedUrl['port'] : '';
+        $user     = isset($parsedUrl['user']) ? $parsedUrl['user'] : '';
+        $pass     = isset($parsedUrl['pass']) ? ':' . $parsedUrl['pass']  : '';
+        $pass     = ($user || $pass) ? "$pass@" : '';
+        $path     = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
+        $query    = isset($parsedUrl['query']) ? '?' . $parsedUrl['query'] : '';
+        $fragment = isset($parsedUrl['fragment']) ? '#' . $parsedUrl['fragment'] : '';
+        return "$scheme$user$pass$host$port$path$query$fragment";
+    }
+}
diff --git a/app/Models/Event.php b/app/Models/Event.php
@@ -394,7 +394,7 @@ public function getIcsForEvent()
      */
     public function getEventUrlAttribute()
     {
-        return route("showEventPage", ["event_id" => $this->id, "event_slug" => Str::slug($this->title)]);
+        return public_route("showEventPage", ["event_id" => $this->id, "event_slug" => Str::slug($this->title)]);
         //return URL::to('/') . '/e/' . $this->id . '/' . Str::slug($this->title);
     }
 

diff --git a/app/Providers/HelpersServiceProvider.php b/app/Providers/HelpersServiceProvider.php
@@ -17,6 +17,9 @@ public function boot()
     {
         require app_path('Helpers/helpers.php');
         require app_path('Helpers/strings.php');
+        require app_path('Helpers/public_route.php');
+        require app_path('Helpers/app_url.php');
+        require app_path('Helpers/unparse_url.php');
         $this->paymentUtils();
     }
 

diff --git a/resources/views/Emails/Layouts/Master.blade.php b/resources/views/Emails/Layouts/Master.blade.php
@@ -22,7 +22,7 @@
                 <table style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;width: 100%">
                     <tr style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
                         <td style="text-align: center;padding: 10px;margin: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
-                            <img style="max-width: 110px;margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6" src="{{url(asset(isset($email_logo) ? $email_logo : 'assets/images/logo-dark.png'))}}" />
+                            <img style="max-width: 110px;margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6" src="{{app_url(asset(isset($email_logo) ? $email_logo : 'assets/images/logo-dark.png'))}}" />
                         </td>
                     </tr>
                     <tr style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">

diff --git a/resources/views/Emails/OrderAttendeeTicket.blade.php b/resources/views/Emails/OrderAttendeeTicket.blade.php
@@ -4,6 +4,6 @@
 
 @lang("basic.hello") {{ $attendee->first_name }},<br><br>
 
-{{ @trans("Order_Emails.tickets_attached") }} <a href="{{route('showOrderDetails', ['order_reference' => $attendee->order->order_reference])}}">{{route('showOrderDetails', ['order_reference' => $attendee->order->order_reference])}}</a>.
+{{ @trans("Order_Emails.tickets_attached") }} <a href="{{public_route('showOrderDetails', ['order_reference' => $attendee->order->order_reference])}}">{{public_route('showOrderDetails', ['order_reference' => $attendee->order->order_reference])}}</a>.
 
 @stop
diff --git a/resources/views/Emails/OrderConfirmation.blade.php b/resources/views/Emails/OrderConfirmation.blade.php
@@ -5,7 +5,7 @@
 
 {!! @trans("Order_Emails.successful_order", ["name"=>$order->event->title]) !!}<br><br>
 
-{{ @trans("Order_Emails.tickets_attached") }} <a href="{{route('showOrderDetails', ['order_reference' => $order->order_reference])}}">{{route('showOrderDetails', ['order_reference' => $order->order_reference])}}</a>.
+{{ @trans("Order_Emails.tickets_attached") }} <a href="{{public_route('showOrderDetails', ['order_reference' => $order->order_reference])}}">{{public_route('showOrderDetails', ['order_reference' => $order->order_reference])}}</a>.
 
 @if(!$order->is_payment_received)
 <br><br>
@@ -20,7 +20,7 @@
 Order Name: <strong>{{$order->full_name}}</strong><br>
 Order Date: <strong>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</strong><br>
 Order Email: <strong>{{$order->email}}</strong><br>
-<a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Add To Calendar</a>
+<a href="{!! public_route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Add To Calendar</a>
 
 @if ($order->is_business)
 <h3>Business Details</h3>

diff --git a/resources/views/Emails/OrderNotification.blade.php b/resources/views/Emails/OrderNotification.blade.php
@@ -133,7 +133,7 @@
 
 
     <br><br>
-    @lang("Order_Emails.manage_order") <a href="{{route('showEventOrders', ['event_id' => $order->event->id, 'q'=>$order->order_reference])}}">{{route('showEventOrders', ['event_id' => $order->event->id, 'q'=>$order->order_reference])}}</a>
+    @lang("Order_Emails.manage_order") <a href="{{public_route('showEventOrders', ['event_id' => $order->event->id, 'q'=>$order->order_reference])}}">{{public_route('showEventOrders', ['event_id' => $order->event->id, 'q'=>$order->order_reference])}}</a>
     <br><br>
 </div>
 <br><br>

diff --git a/resources/views/ManageOrganiser/Partials/TopNav.blade.php b/resources/views/ManageOrganiser/Partials/TopNav.blade.php
@@ -9,10 +9,10 @@
     </li>
     <!--/ Show Side Menu -->
     <li class="nav-button ">
-        <a target="_blank" href="{{ route('showOrganiserHome',[$organiser->id]) }}">
+        <a target="_blank" href="{{ public_route('showOrganiserHome',[$organiser->id]) }}">
             <span>
                 <i class="ico-eye2"></i>&nbsp;@lang("Organiser.organiser_page")
             </span>
         </a>
     </li>
-</ul>
+</ul>
diff --git a/resources/views/en/Emails/Layouts/Master.blade.php b/resources/views/en/Emails/Layouts/Master.blade.php
@@ -22,7 +22,7 @@
                 <table style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6;width: 100%">
                     <tr style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
                         <td style="text-align: center;padding: 10px;margin: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">
-                            <img style="max-width: 110px;margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6" src="{{url(asset(isset($email_logo) ? $email_logo : 'assets/images/logo-dark.png'))}}" />
+                            <img style="max-width: 110px;margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6" src="{{app_url(asset(isset($email_logo) ? $email_logo : 'assets/images/logo-dark.png'))}}" />
                         </td>
                     </tr>
                     <tr style="margin: 0;padding: 0;font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif;font-size: 100%;line-height: 1.6">

diff --git a/resources/views/en/Emails/attendeeTicket.blade.php b/resources/views/en/Emails/attendeeTicket.blade.php
@@ -2,7 +2,7 @@
 
 We've attached your tickets to this email.<br><br>
 
-You can view your order info and download your tickets at {{route('showOrderDetails', ['order_reference' => $attendee->order->order_reference])}} anytime.<br><br>
+You can view your order info and download your tickets at {{public_route('showOrderDetails', ['order_reference' => $attendee->order->order_reference])}} anytime.<br><br>
 
 Your order reference is <b>{{$attendee->order->order_reference}}</b>.<br>