diff --git a/app/Http/Controllers/EventDiscountCodesController.php b/app/Http/Controllers/EventAccessCodesController.php similarity index 74% rename from app/Http/Controllers/EventDiscountCodesController.php rename to app/Http/Controllers/EventAccessCodesController.php index 1fda4309..60e32568 100644 --- a/app/Http/Controllers/EventDiscountCodesController.php +++ b/app/Http/Controllers/EventAccessCodesController.php @@ -4,13 +4,16 @@ namespace App\Http\Controllers; use App\Models\Event; use App\Models\EventAccessCodes; +use Illuminate\Contracts\View\Factory; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\View\View; /* Attendize.com - Event Management & Ticketing */ -class EventDiscountCodesController extends MyBaseController +class EventAccessCodesController extends MyBaseController { /** @@ -20,14 +23,14 @@ class EventDiscountCodesController extends MyBaseController public function show($event_id) { $event = Event::scope()->findOrFail($event_id); - return view('ManageEvent.DiscountCodes', [ + return view('ManageEvent.AccessCodes', [ 'event' => $event, ]); } /** * @param $event_id - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return Factory|View */ public function showCreate($event_id) { @@ -41,7 +44,7 @@ class EventDiscountCodesController extends MyBaseController * * @param Request $request * @param $event_id - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function postCreate(Request $request, $event_id) { @@ -49,7 +52,7 @@ class EventDiscountCodesController extends MyBaseController if (!$eventAccessCode->validate($request->all())) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $eventAccessCode->errors(), ]); } @@ -58,20 +61,20 @@ class EventDiscountCodesController extends MyBaseController $eventAccessCode->code = strtoupper(strip_tags($request->get('code'))); $eventAccessCode->save(); - session()->flash('message', trans('DiscountCodes.success_message')); + session()->flash('message', trans('AccessCodes.success_message')); return response()->json([ 'status' => 'success', 'id' => $eventAccessCode->id, 'message' => trans("Controllers.refreshing"), - 'redirectUrl' => route('showEventDiscountCodes', [ 'event_id' => $event_id ]), + 'redirectUrl' => route('showEventAccessCodes', [ 'event_id' => $event_id ]), ]); } /** * @param integer $event_id * @param integer $access_code_id - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse * @throws \Exception */ public function postDelete($event_id, $access_code_id) @@ -85,18 +88,18 @@ class EventDiscountCodesController extends MyBaseController if ($accessCode->usage_count > 0) { return response()->json([ 'status' => 'error', - 'message' => trans('DiscountCodes.cannot_delete_used_code'), + 'message' => trans('AccessCodes.cannot_delete_used_code'), ]); } $accessCode->delete(); } - session()->flash('message', trans('DiscountCodes.delete_message')); + session()->flash('message', trans('AccessCodes.delete_message')); return response()->json([ 'status' => 'success', 'message' => trans("Controllers.refreshing"), - 'redirectUrl' => route('showEventDiscountCodes', [ 'event_id' => $event_id ]), + 'redirectUrl' => route('showEventAccessCodes', [ 'event_id' => $event_id ]), ]); } } diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index 9516f720..5e4f3124 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -147,8 +147,8 @@ class EventViewController extends Controller { $event = Event::findOrFail($event_id); - $discountCode = strtoupper(strip_tags($request->get('access_code'))); - if (!$discountCode) { + $accessCode = strtoupper(strip_tags($request->get('access_code'))); + if (!$accessCode) { return response()->json([ 'status' => 'error', 'message' => trans('DiscountCodes.valid_code_required'), @@ -159,9 +159,9 @@ class EventViewController extends Controller ->where('is_hidden', true) ->orderBy('sort_order', 'asc') ->get() - ->filter(function($ticket) use ($discountCode) { + ->filter(function($ticket) use ($accessCode) { // Only return the hidden tickets that match the access code - return ($ticket->event_access_codes()->where('code', $discountCode)->get()->count() > 0); + return ($ticket->event_access_codes()->where('code', $accessCode)->get()->count() > 0); }); if ($unlockedHiddenTickets->count() === 0) { @@ -172,7 +172,7 @@ class EventViewController extends Controller } // Bump usage count - EventAccessCodes::logUsage($event_id, $discountCode); + EventAccessCodes::logUsage($event_id, $accessCode); return view('Public.ViewEvent.Partials.EventHiddenTicketsSelection', [ 'event' => $event, diff --git a/app/Http/routes.php b/app/Http/routes.php index 8bb301ec..472abc3a 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -601,27 +601,27 @@ Route::group( /* * ------- - * Event Discount Codes page + * Event Access Codes page * ------- */ - Route::get('{event_id}/discount_codes', [ - 'as' => 'showEventDiscountCodes', - 'uses' => 'EventDiscountCodesController@show', + Route::get('{event_id}/access_codes', [ + 'as' => 'showEventAccessCodes', + 'uses' => 'EventAccessCodesController@show', ]); Route::get('{event_id}/access_codes/create', [ 'as' => 'showCreateEventAccessCode', - 'uses' => 'EventDiscountCodesController@showCreate', + 'uses' => 'EventAccessCodesController@showCreate', ]); Route::post('{event_id}/access_codes/create', [ 'as' => 'postCreateEventAccessCode', - 'uses' => 'EventDiscountCodesController@postCreate', + 'uses' => 'EventAccessCodesController@postCreate', ]); Route::post('{event_id}/access_codes/{access_code_id}/delete', [ 'as' => 'postDeleteEventAccessCode', - 'uses' => 'EventDiscountCodesController@postDelete', + 'uses' => 'EventAccessCodesController@postDelete', ]); /* diff --git a/app/Models/EventAccessCodes.php b/app/Models/EventAccessCodes.php index 76f09b0a..3412405a 100644 --- a/app/Models/EventAccessCodes.php +++ b/app/Models/EventAccessCodes.php @@ -10,13 +10,13 @@ class EventAccessCodes extends MyBaseModel /** * @param integer $event_id - * @param string $discountCode + * @param string $accessCode * @return void */ - public static function logUsage($event_id, $discountCode) + public static function logUsage($event_id, $accessCode) { (new static)::where('event_id', $event_id) - ->where('code', $discountCode) + ->where('code', $accessCode) ->increment('usage_count'); } diff --git a/resources/lang/en/AccessCodes.php b/resources/lang/en/AccessCodes.php new file mode 100644 index 00000000..49c0786c --- /dev/null +++ b/resources/lang/en/AccessCodes.php @@ -0,0 +1,18 @@ + 'Access Codes', + 'success_message' => 'Successfully Created Access Code', + 'delete_message' => 'Successfully Removed Access Code', + 'cannot_delete_used_code' => 'Cannot Delete a Used Code', + 'access_codes_code' => 'Discount Code', + 'access_codes_created_at' => 'Created At', + 'no_access_codes_yet' => 'No Access Codes yet!', + 'create_access_code' => 'Create Access Code', + 'access_code_title' => 'Access Code', + 'access_code_title_placeholder' => 'ex: CONFERENCE2019', + 'valid_code_required' => 'A valid access code is required', + 'no_tickets_matched' => 'No Tickets matched to your access code', + 'select_access_code' => 'Select Access Codes', + 'access_codes_usage_count' => 'Usage Count', +]; \ No newline at end of file diff --git a/resources/lang/en/DiscountCodes.php b/resources/lang/en/DiscountCodes.php deleted file mode 100644 index 1b98d8db..00000000 --- a/resources/lang/en/DiscountCodes.php +++ /dev/null @@ -1,18 +0,0 @@ - 'Discount Codes', - 'success_message' => 'Successfully Created Discount Code', - 'delete_message' => 'Successfully Removed Discount Code', - 'cannot_delete_used_code' => 'Cannot Delete a Used Code', - 'discount_codes_code' => 'Discount Code', - 'discount_codes_created_at' => 'Created At', - 'no_discount_codes_yet' => 'No Discount Codes yet!', - 'create_discount_code' => 'Create Discount Code', - 'discount_code_title' => 'Discount Code', - 'discount_code_title_placeholder' => 'ex: CONFERENCE2019', - 'valid_code_required' => 'A valid discount code is required', - 'no_tickets_matched' => 'No Tickets matched to your discount code', - 'select_discount_code' => 'Select Discount Codes', - 'discount_codes_usage_count' => 'Usage Count', -]; \ No newline at end of file diff --git a/resources/lang/en/ManageEvent.php b/resources/lang/en/ManageEvent.php index 5fee85e3..1ccae0a0 100644 --- a/resources/lang/en/ManageEvent.php +++ b/resources/lang/en/ManageEvent.php @@ -24,7 +24,6 @@ return array ( 'create_attendees' => 'Create Attendees', 'create_ticket' => 'Create Ticket', 'download_pdf_ticket' => 'Download PDF Ticket', - 'discount_codes' => 'Discount Codes', 'edit_attendee' => 'Edit Attendee', 'edit_attendee_title' => 'Edit :attendee', 'edit_order_title' => 'Order: :order_ref', diff --git a/resources/views/ManageEvent/DiscountCodes.blade.php b/resources/views/ManageEvent/AccessCodes.blade.php similarity index 80% rename from resources/views/ManageEvent/DiscountCodes.blade.php rename to resources/views/ManageEvent/AccessCodes.blade.php index e008dabc..1b57abd3 100644 --- a/resources/views/ManageEvent/DiscountCodes.blade.php +++ b/resources/views/ManageEvent/AccessCodes.blade.php @@ -2,7 +2,7 @@ @section('title') @parent - @lang('DiscountCodes.title') + @lang('AccessCodes.title') @stop @section('top_nav') @@ -15,7 +15,7 @@ @section('page_title') - @lang('DiscountCodes.title') + @lang('AccessCodes.title') @stop @section('content') @@ -29,7 +29,8 @@
@@ -40,29 +41,29 @@
@if($event->access_codes->count())
- +
- - - + + + - @foreach($event->access_codes as $discountCode) + @foreach($event->access_codes as $accessCode) - - - + + + {{-- Can only remove if haven't been used before--}} - @if ($discountCode->usage_count === 0) + @if ($accessCode->usage_count === 0)
@lang("DiscountCodes.discount_codes_code")@lang("DiscountCodes.discount_codes_usage_count")@lang("DiscountCodes.discount_codes_created_at")@lang("AccessCodes.access_codes_code")@lang("AccessCodes.access_codes_usage_count")@lang("AccessCodes.access_codes_created_at")
{{ $discountCode->code }}{{ $discountCode->usage_count }}{{ $discountCode->created_at }}{{ $accessCode->code }}{{ $accessCode->usage_count }}{{ $accessCode->created_at }} $discountCode->event_id, - 'access_code_id' => $discountCode->id, + 'event_id' => $accessCode->event_id, + 'access_code_id' => $accessCode->id, ]) }}> Remove @@ -75,7 +76,7 @@ @else
- @lang("DiscountCodes.no_discount_codes_yet") + @lang("AccessCodes.no_access_codes_yet")
@endif diff --git a/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php b/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php index f9cb849c..18379ef6 100644 --- a/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php +++ b/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php @@ -6,17 +6,17 @@

- @lang("DiscountCodes.create_discount_code")

+ @lang("AccessCodes.create_access_code")
- {!! Form::label('code', trans("DiscountCodes.discount_code_title"), ['class'=>'control-label required']) !!} + {!! Form::label('code', trans("AccessCodes.access_code_title"), ['class'=>'control-label required']) !!} {!! Form::text('code', Input::old('code'), [ 'class'=>'form-control', - 'placeholder' => trans("DiscountCodes.discount_code_title_placeholder") + 'placeholder' => trans("AccessCodes.access_code_title_placeholder") ]) !!}
@@ -24,7 +24,7 @@
{!! Form::button(trans("basic.cancel"), ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!} - {!! Form::submit(trans("DiscountCodes.create_discount_code"), ['class'=>"btn btn-success"]) !!} + {!! Form::submit(trans("AccessCodes.create_access_code"), ['class'=>"btn btn-success"]) !!}
{!! Form::close() !!} diff --git a/resources/views/ManageEvent/Modals/EditTicket.blade.php b/resources/views/ManageEvent/Modals/EditTicket.blade.php index f4ea4a81..2928d183 100644 --- a/resources/views/ManageEvent/Modals/EditTicket.blade.php +++ b/resources/views/ManageEvent/Modals/EditTicket.blade.php @@ -104,7 +104,7 @@ @if ($ticket->is_hidden)
-

{{ __('DiscountCodes.select_discount_code') }}

+

{{ __('AccessCodes.select_access_code') }}

@if($ticket->event->access_codes->count()) - @lang("DiscountCodes.no_discount_codes_yet") + @lang("AccessCodes.no_access_codes_yet")
@endif diff --git a/resources/views/ManageEvent/Partials/Sidebar.blade.php b/resources/views/ManageEvent/Partials/Sidebar.blade.php index b9615993..f03ea3f3 100644 --- a/resources/views/ManageEvent/Partials/Sidebar.blade.php +++ b/resources/views/ManageEvent/Partials/Sidebar.blade.php @@ -68,10 +68,10 @@ @lang("ManageEvent.widgets") -
  • - +
  • + - @lang("ManageEvent.discount_codes") + @lang("AccessCodes.title")