Laravel Consolidate Namespaces Shift

app/Models/Account.php → app/Account.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Attendize\Utils;
+use App\App\Utils;
 use DB;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;

app/Http/Controllers/EventCheckoutController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Attendize\PaymentUtils;
+use App\App\PaymentUtils;
 use App\Jobs\SendOrderAttendeeTicketJob;
 use App\Jobs\SendOrderConfirmationJob;
 use App\Jobs\SendOrderNotificationJob;

app/Http/Controllers/EventController.php

@@ -385,28 +385,23 @@ public function CreateCloneEvent($event_id = '')
         /* Set values for the new Event */
         $cloned_event->is_live = 0;
         $cloned_event->id = null;
-        $cloned_event->title = $event->title . '(New)';
+        $cloned_event->title = $event->title.'(New)';
         $cloned_event->start_date = $fechaini;
         $cloned_event->end_date = $fechafin;
         $cloned_event->exists = false; //very important so IsDirty returns correctly
-
 
-        try
-        {
+        try {
             $cloned_event->save();
-        }
-        catch(\Exception $e)
-        {
+        } catch (\Exception $e) {
             Log::error($e);
-            return response()->json(['status' => $e, 'messages' => trans("Controllers.event_create_exception") , ]);
+
+            return response()->json(['status' => $e, 'messages' => trans('Controllers.event_create_exception')]);
         }
 
         // now get images and duplicate them (thanks for a better code from @emergingdzns )
         $images = EventImage::where('event_id', $event->id)->get();
-        if (count($images) > 0)
-        {
-            foreach ($images as $image)
-            {
+        if (count($images) > 0) {
+            foreach ($images as $image) {
                 $newImage = new EventImage();
                 $newImage->image_path = $image->image_path;
                 $newImage->created_at = date('Y-m-d H:i:s');
@@ -420,23 +415,17 @@ public function CreateCloneEvent($event_id = '')
 
         // now get survey question for the event and associate them
         $eventquestions = $event->questions()->get();
-        if (count($eventquestions) > 0)
-        {
-            foreach ($eventquestions as $question)
-            {
+        if (count($eventquestions) > 0) {
+            foreach ($eventquestions as $question) {
                 $cloned_event->questions()
                     ->attach($question->id);
             }
         }
 
         // now get tickets for the event and duplicate them
         $tickets = Ticket::where('event_id', $event->id)->get();
-        if (count($tickets) > 0)
-        {
-
-            foreach ($tickets as $ticket)
-            {
-
+        if (count($tickets) > 0) {
+            foreach ($tickets as $ticket) {
                 $ticketa = $ticket->toArray();
                 unset($ticketa['id']);
                 $ticketa['event_id'] = $cloned_event->id;
@@ -448,36 +437,34 @@ public function CreateCloneEvent($event_id = '')
                 $newTicket->fill($ticketa);
                 $newTicket->save();
 
-                if (count($eventquestions) > 0)
-                {
-                    foreach ($eventquestions as $question)
-                    {
-                        if (in_array($ticket->id, $question->tickets->pluck('id')->toArray()))
-                        {
+                if (count($eventquestions) > 0) {
+                    foreach ($eventquestions as $question) {
+                        if (in_array($ticket->id, $question->tickets->pluck('id')->toArray())) {
                             $question->tickets()->sync($newTicket->id);
                         }
                     }
                 }
-
             }
-
         }
         /* redirect to wherever you want */
-        return redirect(route('showOrganiserEvents', array('organiser_id' => $cloned_event->organiser_id)));
-
+        return redirect(route('showOrganiserEvents', ['organiser_id' => $cloned_event->organiser_id]));
     }
+
     public function archiveEvent($event_id = '')
     {
         $event = Event::scope()->findOrFail($event_id);
         $event->delete();
+
         return redirect()->route('showOrganiserEvents', $event->organiser->id);
     }
+
     public function restoreEvent($event_id = '')
     {
         $event = Event::withTrashed()->scope()
             ->findOrFail($event_id);
         $event->deleted_at = null;
         $event->save();
+
         return redirect()->route('showOrganiserEvents', $event->organiser->id);
     }
 }

app/Http/Controllers/EventViewController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Attendize\Utils;
+use App\App\Utils;
 use App\Models\Affiliate;
 use App\Models\Event;
 use App\Models\EventAccessCodes;

app/Http/Controllers/OrganiserEventsController.php

@@ -24,26 +24,26 @@ public function showEvents(Request $request, $organiser_id)
         $searchQuery = $request->get('q');
         $sort_by = (in_array($request->get('sort_by'), $allowed_sorts) ? $request->get('sort_by') : 'start_date');
 
-if ($request->has('archived')) {
-        $events = $searchQuery
-            ? Event::withTrashed()->scope()->with(['organiser', 'currency'])->where('title', 'like', '%' . $searchQuery . '%')->orderBy($sort_by,
+        if ($request->has('archived')) {
+            $events = $searchQuery
+            ? Event::withTrashed()->scope()->with(['organiser', 'currency'])->where('title', 'like', '%'.$searchQuery.'%')->orderBy($sort_by,
                 'desc')->where('organiser_id', '=', $organiser_id)->paginate(12)
             : Event::withTrashed()->scope()->with(['organiser', 'currency'])->where('organiser_id', '=', $organiser_id)->orderBy($sort_by, 'desc')->paginate(12);
         } else {
             $events = $searchQuery
-                ? Event::scope()->with(['organiser', 'currency'])->where('title', 'like', '%' . $searchQuery . '%')->orderBy($sort_by,
+                ? Event::scope()->with(['organiser', 'currency'])->where('title', 'like', '%'.$searchQuery.'%')->orderBy($sort_by,
                     'desc')->where('organiser_id', '=', $organiser_id)->paginate(12)
                 : Event::scope()->with(['organiser', 'currency'])->where('organiser_id', '=', $organiser_id)->orderBy($sort_by, 'desc')->paginate(12);
         }
-        
+
         $data = [
             'events'    => $events,
             'organiser' => $organiser,
             'search'    => [
                 'q'        => $searchQuery ? $searchQuery : '',
                 'sort_by'  => $request->get('sort_by') ? $request->get('sort_by') : '',
                 'showPast' => $request->get('past'),
-		  'archived' => $request->get('archived'),
+                'archived' => $request->get('archived'),
             ],
         ];
 

app/Http/Controllers/OrganiserViewController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Attendize\Utils;
+use App\App\Utils;
 use App\Models\Organiser;
 use Auth;
 use Illuminate\Contracts\View\View;

app/Http/Controllers/UserSignupController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Attendize\Utils;
+use App\App\Utils;
 use App\Models\Account;
 use App\Models\User;
 use Hash;

app/Http/Middleware/CheckInstalled.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Attendize\Utils;
+use App\App\Utils;
 use App\Models\Account;
 use Closure;
 use Illuminate\Http\Request;

app/Http/Middleware/SetViewVariables.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Attendize\Utils;
+use App\App\Utils;
 use App\Models\Organiser;
 use Closure;
 use Illuminate\Support\Facades\Auth;

app/Providers/HelpersServiceProvider.php

@@ -2,7 +2,7 @@
 
 namespace App\Providers;
 
-use App\Attendize\PaymentUtils;
+use App\App\PaymentUtils;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 

app/Models/Ticket.php → app/Ticket.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Attendize\PaymentUtils;
+use App\App\PaymentUtils;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -23,33 +23,32 @@ class Ticket extends MyBaseModel
     protected $quantity_reserved_cache = null;
 
     /**
-     * @var array $fillable
+     * @var array
      */
     protected $fillable = [
-	'created_at',
-	'created_at',
-	'updated_at',
-	'deleted_at',
-	'edited_by_user_id',
-	'account_id',
-	'order_id',
-	'event_id',
-	'title',
-	'description',
-	'price',
-	'max_per_person',
-	'min_per_person',
-	'quantity_available',
-	'quantity_sold',
-	'sales_volume',
-	'organiser_fees_volume',
-	'is_paused',
-	'public_id',
-	'user_id',
-	'sort_order',
-	'is_hidden'
-        ];
-
+        'created_at',
+        'created_at',
+        'updated_at',
+        'deleted_at',
+        'edited_by_user_id',
+        'account_id',
+        'order_id',
+        'event_id',
+        'title',
+        'description',
+        'price',
+        'max_per_person',
+        'min_per_person',
+        'quantity_available',
+        'quantity_sold',
+        'sales_volume',
+        'organiser_fees_volume',
+        'is_paused',
+        'public_id',
+        'user_id',
+        'sort_order',
+        'is_hidden',
+    ];
 
     /**
      * The rules to validate the model.

composer.json

@@ -66,7 +66,6 @@
         ],
         "psr-4": {
             "App\\": "app/",
-            "Attendize\\": "app/Models",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
         }

config/app.php

@@ -250,7 +250,7 @@
         // Attendize Class Alias
         'Markdown'     => GrahamCampbell\Markdown\Facades\Markdown::class,
         'PDF'          => Nitmedia\Wkhtml2pdf\Facades\Wkhtml2pdf::class,
-        'Utils'        => App\Attendize\Utils::class,
+        'Utils'        => App\App\Utils::class,
         'Excel'        => Maatwebsite\Excel\Facades\Excel::class,
     ],