From 9101dd00fdb9303b5673ddfd703d70fb006d675c Mon Sep 17 00:00:00 2001 From: Etienne Marais Date: Wed, 13 Feb 2019 10:24:52 +0200 Subject: [PATCH] Renamed all the mentions of access codes to be called discount codes and removed the access codes translation file --- app/Http/Controllers/EventViewController.php | 18 ++++++++---------- resources/lang/en/DiscountCodes.php | 8 ++++++++ resources/lang/en/EventAccessCode.php | 10 ---------- .../views/ManageEvent/DiscountCodes.blade.php | 8 ++++---- .../Modals/CreateAccessCode.blade.php | 8 ++++---- .../ManageEvent/Modals/EditTicket.blade.php | 2 +- 6 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 resources/lang/en/EventAccessCode.php diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index 49746fd5..b51a789a 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -146,11 +146,11 @@ class EventViewController extends Controller { $event = Event::findOrFail($event_id); - $accessCode = $request->get('access_code'); - if (!$accessCode) { + $discountCode = $request->get('access_code'); + if (!$discountCode) { return response()->json([ 'status' => 'error', - 'message' => 'A valid access code is required', + 'message' => trans('DiscountCodes.valid_code_required'), ]); } @@ -158,24 +158,22 @@ class EventViewController extends Controller ->where('is_hidden', true) ->orderBy('sort_order', 'asc') ->get() - ->filter(function($ticket) use ($accessCode) { + ->filter(function($ticket) use ($discountCode) { // Only return the hidden tickets that match the access code - return ($ticket->event_access_codes()->where('code', $accessCode)->get()->count() > 0); + return ($ticket->event_access_codes()->where('code', $discountCode)->get()->count() > 0); }); if ($unlockedHiddenTickets->count() === 0) { return response()->json([ 'status' => 'error', - 'message' => 'No Tickets matched to your unlock code', + 'message' => trans('DiscountCodes.no_tickets_matched'), ]); } - $data = [ + return view('Public.ViewEvent.Partials.EventHiddenTicketsSelection', [ 'event' => $event, 'tickets' => $unlockedHiddenTickets, 'is_embedded' => 0, - ]; - - return view('Public.ViewEvent.Partials.EventHiddenTicketsSelection', $data); + ]); } } diff --git a/resources/lang/en/DiscountCodes.php b/resources/lang/en/DiscountCodes.php index c145a6a6..1d9c97ff 100644 --- a/resources/lang/en/DiscountCodes.php +++ b/resources/lang/en/DiscountCodes.php @@ -3,4 +3,12 @@ return [ 'title' => 'Discount Codes', 'success_message' => 'Successfully Created Discount 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', ]; \ No newline at end of file diff --git a/resources/lang/en/EventAccessCode.php b/resources/lang/en/EventAccessCode.php deleted file mode 100644 index dd12dd47..00000000 --- a/resources/lang/en/EventAccessCode.php +++ /dev/null @@ -1,10 +0,0 @@ - 'Access Codes to unlock hidden tickets', - 'access_codes_code' => 'Code', - 'access_codes_created_at' => 'Created At', - 'no_access_codes_yet' => 'No Access Codes yet!', - 'create_access_code' => 'Create Access Code', - 'access_code_title' => 'Code', - 'access_code_title_placeholder' => 'ex: CONFERENCE2019', -]; \ No newline at end of file diff --git a/resources/views/ManageEvent/DiscountCodes.blade.php b/resources/views/ManageEvent/DiscountCodes.blade.php index 65f7c4b9..5f7008d6 100644 --- a/resources/views/ManageEvent/DiscountCodes.blade.php +++ b/resources/views/ManageEvent/DiscountCodes.blade.php @@ -41,7 +41,7 @@
@@ -55,8 +55,8 @@ - - + + @@ -72,7 +72,7 @@ @else
- @lang("EventAccessCode.no_access_codes_yet") + @lang("DiscountCodes.no_discount_codes_yet")
@endif diff --git a/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php b/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php index 11a6ded0..f9cb849c 100644 --- a/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php +++ b/resources/views/ManageEvent/Modals/CreateAccessCode.blade.php @@ -6,17 +6,17 @@

- @lang("EventAccessCode.create_access_code")

+ @lang("DiscountCodes.create_discount_code")
- {!! Form::label('code', trans("EventAccessCode.access_code_title"), ['class'=>'control-label required']) !!} + {!! Form::label('code', trans("DiscountCodes.discount_code_title"), ['class'=>'control-label required']) !!} {!! Form::text('code', Input::old('code'), [ 'class'=>'form-control', - 'placeholder' => trans("EventAccessCode.access_code_title_placeholder") + 'placeholder' => trans("DiscountCodes.discount_code_title_placeholder") ]) !!}
@@ -24,7 +24,7 @@
{!! Form::button(trans("basic.cancel"), ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!} - {!! Form::submit(trans("EventAccessCode.create_access_code"), ['class'=>"btn btn-success"]) !!} + {!! Form::submit(trans("DiscountCodes.create_discount_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 e45b0ae9..1fa9de73 100644 --- a/resources/views/ManageEvent/Modals/EditTicket.blade.php +++ b/resources/views/ManageEvent/Modals/EditTicket.blade.php @@ -124,7 +124,7 @@ @endforeach @else
- @lang("EventAccessCode.no_access_codes_yet") + @lang("DiscountCodes.no_discount_codes_yet")
@endif
@lang("EventAccessCode.access_codes_code")@lang("EventAccessCode.access_codes_created_at")@lang("DiscountCodes.discount_codes_code")@lang("DiscountCodes.discount_codes_created_at")