diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 2cbcf94c..8468f875 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -185,7 +185,9 @@ class EventCheckInController extends MyBaseController return response()->json([ 'status' => 'success', - 'message' => trans("Controllers.attendee_check_in_success", ["name"=>$attendee->first_name." ".$attendee->last_name, "ref"=>$attendee->reference, "ticket"=>$attendee->ticket]).$appendedText + 'name' => $attendee->first_name." ".$attendee->last_name, + 'reference' => $attendee->reference, + 'ticket' => $attendee->ticket ]); } diff --git a/app/Http/Controllers/InstallerController.php b/app/Http/Controllers/InstallerController.php index 57ab0e10..4342a47e 100644 --- a/app/Http/Controllers/InstallerController.php +++ b/app/Http/Controllers/InstallerController.php @@ -87,6 +87,10 @@ class InstallerController extends Controller */ public function postInstaller(Request $request) { + if (file_exists(base_path('installed'))) { + abort(404); + } + set_time_limit(300); $database['type'] = $request->get('database_type'); diff --git a/public/assets/javascript/check_in.js b/public/assets/javascript/check_in.js index 0ed0da41..54cb2ee4 100644 --- a/public/assets/javascript/check_in.js +++ b/public/assets/javascript/check_in.js @@ -15,8 +15,7 @@ var checkinApp = new Vue({ canvasContext: $('canvas#QrCanvas')[0].getContext('2d'), successBeep: new Audio('/mp3/beep.mp3'), scanResult: false, - scanResultMessage: '', - scanResultType: null + scanResultObject: {} }, created: function () { @@ -78,11 +77,10 @@ var checkinApp = new Vue({ this.$http.post(Attendize.qrcodeCheckInRoute, {attendee_reference: attendeeReferenceCode}).then(function (res) { this.successBeep.play(); this.scanResult = true; - this.scanResultMessage = res.data.message; - this.scanResultType = res.data.status; + this.scanResultObject = res.data; }, function (response) { - this.scanResultMessage = lang("whoops2"); + this.scanResultObject.message = lang("whoops2"); }); }, diff --git a/public/assets/stylesheet/check_in.css b/public/assets/stylesheet/check_in.css index 3b605eb5..3c340064 100644 --- a/public/assets/stylesheet/check_in.css +++ b/public/assets/stylesheet/check_in.css @@ -216,6 +216,9 @@ footer { text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.63); } +.uppercase { + text-transform: uppercase; +} diff --git a/resources/lang/en/Attendee.php b/resources/lang/en/Attendee.php index 877d9439..147674fd 100644 --- a/resources/lang/en/Attendee.php +++ b/resources/lang/en/Attendee.php @@ -1,6 +1,6 @@ 'First Name', 'last_name' => 'Last Name', 'name' => 'Name', + 'ticket' => 'Ticket', + 'reference' => 'Reference', 'search_attendees' => 'Search Attendees...', 'send_invitation_n_ticket_to_attendee' => 'Send invitation & ticket to attendee.', -); \ No newline at end of file +); diff --git a/resources/lang/en/Controllers.php b/resources/lang/en/Controllers.php index d5d170ce..793e6644 100644 --- a/resources/lang/en/Controllers.php +++ b/resources/lang/en/Controllers.php @@ -1,12 +1,12 @@ + 'sort' => array ( 'event_title' => 'Event Title', 'start_date' => 'Start Date', @@ -22,7 +22,6 @@ return array ( 'addInviteError' => 'You need to create a ticket before you can invite an attendee.', 'attendee_already_cancelled' => 'Attendee Already Cancelled', 'attendee_already_checked_in' => 'Attendee already checked in at :time ', - 'attendee_check_in_success' => 'Success !
Name: :name
Reference: :ref
Ticket: :ticket.', 'attendee_exception' => 'An error occurred while inviting this attendee. Please try again.', 'attendee_successfully_checked_in' => 'Attendee Succesfully Checked In', 'attendee_successfully_checked_out' => 'Attendee Succesfully Checked Out', @@ -31,31 +30,31 @@ return array ( 'check_in_all_tickets' => 'Check in all tickets associated to this order', 'confirmation_malformed' => 'The confirmation code is missing or malformed.', 'confirmation_successful' => 'Success! Your email is now verified. You can now login.', - 'error' => + 'error' => array ( - 'email' => + 'email' => array ( 'email' => 'Please enter a valid E-mail address.', 'required' => 'E-mail address is required.', 'unique' => 'E-mail already in use for this account.', ), - 'first_name' => + 'first_name' => array ( 'required' => 'Please enter your first name.', ), - 'last_name' => + 'last_name' => array ( 'required' => 'Please enter your last name.', ), - 'page_bg_color' => + 'page_bg_color' => array ( 'required' => 'Please enter a background color.', ), - 'page_header_bg_color' => + 'page_header_bg_color' => array ( 'required' => 'Please enter a header background color.', ), - 'password' => + 'password' => array ( 'passcheck' => 'This password is incorrect.', ), diff --git a/resources/lang/pl/Attendee.php b/resources/lang/pl/Attendee.php index c7e998fc..109bd28b 100644 --- a/resources/lang/pl/Attendee.php +++ b/resources/lang/pl/Attendee.php @@ -1,6 +1,6 @@ 'Uczestnicy Wydarzenia', 'first_name' => 'Imię', 'last_name' => 'Nazwisko', - 'name' => 'Imię i Nazwisko', + 'name' => 'Imię', + 'ticket' => 'Bilet', + 'reference' => 'Zamówienie', 'search_attendees' => 'Przeszukaj dane uczestników...', 'send_invitation_n_ticket_to_attendee' => 'Wyślij zaproszenie i bilet do uczestnika.', -); \ No newline at end of file +); diff --git a/resources/lang/pl/Controllers.php b/resources/lang/pl/Controllers.php index 13f81029..2d7aa3f6 100644 --- a/resources/lang/pl/Controllers.php +++ b/resources/lang/pl/Controllers.php @@ -7,7 +7,7 @@ return array ( //============================== New strings to translate ==============================// // Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageOrganiser\\Events.blade.php 'sort' => - array ( + array ( 'event_title' => 'Nazwa Wydarzenia', 'start_date' => 'Data Rozpoczęcia', 'created_at' => 'Data Utworzenia', @@ -22,7 +22,6 @@ return array ( 'addInviteError' => 'Musisz utworzyć bilet zanim utworzysz uczestnika.', 'attendee_already_cancelled' => 'Uczestnik już anulowany', 'attendee_already_checked_in' => 'Uczestnik już wszedł w tym momencie: :time ', - 'attendee_check_in_success' => 'Sukces !
Imię: :name
Zamówienie: :ref
Bilet: :ticket.', 'attendee_exception' => 'Wystąpił błąd w trakcie zapraszania tego uczestnika. Spróbuj ponownie.', 'attendee_successfully_checked_in' => 'Uczestnik oznaczony', 'attendee_successfully_checked_out' => 'Uczestnik odznaczony', diff --git a/resources/views/ManageEvent/CheckIn.blade.php b/resources/views/ManageEvent/CheckIn.blade.php index ea0d4f9a..e7b5b1b7 100644 --- a/resources/views/ManageEvent/CheckIn.blade.php +++ b/resources/views/ManageEvent/CheckIn.blade.php @@ -132,16 +132,21 @@
-
- - +
+ +
- - @{{{ scanResultMessage }}} + + @{{ scanResultObject.message }} - + + @lang("Attendee.name"): @{{ scanResultObject.name }}
+ @lang("Attendee.reference"): @{{scanResultObject.reference }}
+ @lang("Attendee.ticket"): @{{scanResultObject.ticket }} + +
@lang("Attendee.scanning")...