From 118efbe8ae482d29d6dc05754cb51a00c0967134 Mon Sep 17 00:00:00 2001 From: Scott Bowler Date: Mon, 3 Sep 2018 10:49:29 +0100 Subject: [PATCH 01/12] Fix issue where taxamt not set after import --- app/Http/Controllers/EventAttendeesController.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index e4464488..f4f7883c 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -288,6 +288,7 @@ class EventAttendeesController extends MyBaseController } $ticket_id = $request->get('ticket_id'); + $event = Event::findOrFail($event_id); $ticket_price = 0; $email_attendee = $request->get('email_ticket'); $num_added = 0; @@ -318,6 +319,16 @@ class EventAttendeesController extends MyBaseController $order->amount = $ticket_price; $order->account_id = Auth::user()->account_id; $order->event_id = $event_id; + + // Calculating grand total including tax + $orderService = new OrderService($ticket_price, 0, $event); + $orderService->calculateFinalCosts(); + $order->taxamt = $orderService->getTaxAmount(); + + if ($orderService->getGrandTotal() == 0) { + $order->is_payment_received = 1; + } + $order->save(); /** @@ -874,3 +885,4 @@ class EventAttendeesController extends MyBaseController } + From 534d3a2126dcaef668d7b3866582b9dffcbedca8 Mon Sep 17 00:00:00 2001 From: Scott Bowler Date: Mon, 3 Sep 2018 14:44:56 +0100 Subject: [PATCH 02/12] Modify deprecated "lists" to "pluck" --- resources/views/ManageEvent/Modals/EditQuestion.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/ManageEvent/Modals/EditQuestion.blade.php b/resources/views/ManageEvent/Modals/EditQuestion.blade.php index 6d9030da..410b90ea 100644 --- a/resources/views/ManageEvent/Modals/EditQuestion.blade.php +++ b/resources/views/ManageEvent/Modals/EditQuestion.blade.php @@ -90,7 +90,7 @@ @foreach ($event->tickets as $ticket)
- id, $question->tickets->lists('id')->toArray()) ? 'checked' : ''}} id="ticket_{{ $ticket->id }}" data-toggle="toggle" name="tickets[]" type="checkbox" value="{{ $ticket->id }}"> + id, $question->tickets->pluck('id')->toArray()) ? 'checked' : ''}} id="ticket_{{ $ticket->id }}" data-toggle="toggle" name="tickets[]" type="checkbox" value="{{ $ticket->id }}">
@endforeach @@ -106,4 +106,4 @@ {!! Form::close() !!} - \ No newline at end of file + From d6bada6382309748620221aa90aba85ee39a847e Mon Sep 17 00:00:00 2001 From: dsnap1993 Date: Sat, 29 Sep 2018 01:15:57 +0900 Subject: [PATCH 03/12] fix bug where postMessageOrder gets datas of orders table --- app/Http/Controllers/EventOrdersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/EventOrdersController.php b/app/Http/Controllers/EventOrdersController.php index fe383bb1..d4887fe0 100644 --- a/app/Http/Controllers/EventOrdersController.php +++ b/app/Http/Controllers/EventOrdersController.php @@ -434,7 +434,7 @@ class EventOrdersController extends MyBaseController ]); } - $order = Attendee::scope()->findOrFail($order_id); + $order = Order::scope()->findOrFail($order_id); $data = [ 'order' => $order, From 5cdfe7151bd2f8bd9dd2b057dd5e9b2de7120f57 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Sat, 22 Sep 2018 21:12:16 +1000 Subject: [PATCH 04/12] Fix XSS vulnerability on QR code scanner --- .../Controllers/EventCheckInController.php | 4 +++- public/assets/javascript/check_in.js | 8 +++----- public/assets/stylesheet/check_in.css | 3 +++ resources/lang/en/Attendee.php | 6 ++++-- resources/lang/en/Controllers.php | 19 +++++++++---------- resources/lang/pl/Attendee.php | 8 +++++--- resources/lang/pl/Controllers.php | 3 +-- resources/views/ManageEvent/CheckIn.blade.php | 17 +++++++++++------ 8 files changed, 39 insertions(+), 29 deletions(-) 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/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")...
From 0b831955f288fa820bd467266882d94791fe1884 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Sun, 30 Sep 2018 16:46:33 +1000 Subject: [PATCH 05/12] Fix a DoS or even PrivEsc vuln on POST /install POST on /install must not respond when already installed. Denial of Service and possibly Privilege Escalation by changing the database/mail server --- app/Http/Controllers/InstallerController.php | 4 ++++ 1 file changed, 4 insertions(+) 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'); From 1eae6cce01531a4d9fd2a5b0e06419b747dbc1ef Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Mon, 24 Sep 2018 11:09:37 +0200 Subject: [PATCH 06/12] remove any html tags on user input --- app/Http/Controllers/EventCheckoutController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 5d6f94df..c8082831 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -539,8 +539,8 @@ class EventCheckoutController extends Controller if ($ticket_order['order_requires_payment'] && !isset($request_data['pay_offline'])) { $order->payment_gateway_id = $ticket_order['payment_gateway']->id; } - $order->first_name = $request_data['order_first_name']; - $order->last_name = $request_data['order_last_name']; + $order->first_name = strip_tags($request_data['order_first_name']); + $order->last_name = strip_tags($request_data['order_last_name']); $order->email = $request_data['order_email']; $order->order_status_id = isset($request_data['pay_offline']) ? config('attendize.order_awaiting_payment') : config('attendize.order_complete'); $order->amount = $ticket_order['order_total']; @@ -624,8 +624,8 @@ class EventCheckoutController extends Controller for ($i = 0; $i < $attendee_details['qty']; $i++) { $attendee = new Attendee(); - $attendee->first_name = $request_data["ticket_holder_first_name"][$i][$attendee_details['ticket']['id']]; - $attendee->last_name = $request_data["ticket_holder_last_name"][$i][$attendee_details['ticket']['id']]; + $attendee->first_name = strip_tags($request_data["ticket_holder_first_name"][$i][$attendee_details['ticket']['id']]); + $attendee->last_name = strip_tags($request_data["ticket_holder_last_name"][$i][$attendee_details['ticket']['id']]); $attendee->email = $request_data["ticket_holder_email"][$i][$attendee_details['ticket']['id']]; $attendee->event_id = $event_id; $attendee->order_id = $order->id; From b62e41265f0768822094ab047aab3a5cc962a688 Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Mon, 24 Sep 2018 11:10:31 +0200 Subject: [PATCH 07/12] strip html tags as the string is not escaped by blade --- resources/views/ManageEvent/Modals/EditAttendee.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/ManageEvent/Modals/EditAttendee.blade.php b/resources/views/ManageEvent/Modals/EditAttendee.blade.php index f31750b3..b054b6bb 100644 --- a/resources/views/ManageEvent/Modals/EditAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/EditAttendee.blade.php @@ -6,7 +6,7 @@

- {!! @trans("ManageEvent.edit_attendee_title", ["attendee"=>$attendee->full_name]) !!} + {!! @trans("ManageEvent.edit_attendee_title", ["attendee"=> strip_tags($attendee->full_name) ]) !!}

From 703ad37ef5e8e7c03276198d4e1b3ab997c27e6e Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Sat, 29 Sep 2018 15:15:57 +0200 Subject: [PATCH 08/12] Prevent xss 1) added better validation across all user input both for the operator of Attendize and end user. 2) Remove html from translations so {{ }} can be used instead of {!! !!} as its more secure. --- .../Controllers/EventAttendeesController.php | 8 +- app/Models/Ticket.php | 3 +- resources/lang/en/Event.php | 7 +- resources/lang/en/ManageEvent.php | 30 ++- resources/lang/en/Message.php | 8 +- resources/lang/en/Order.php | 17 +- resources/lang/en/Public_ViewEvent.php | 9 +- resources/lang/en/User.php | 6 - resources/lang/pl/Event.php | 7 +- resources/lang/pl/ManageEvent.php | 26 +-- resources/lang/pl/Message.php | 8 +- resources/lang/pl/Order.php | 17 +- resources/lang/pl/Public_ViewEvent.php | 7 +- resources/lang/pl/User.php | 6 - .../Modals/CancelAttendee.blade.php | 8 +- .../ManageEvent/Modals/CancelOrder.blade.php | 218 +++++++++--------- .../ManageEvent/Modals/EditAttendee.blade.php | 2 +- .../ManageEvent/Modals/EditOrder.blade.php | 2 +- .../ManageEvent/Modals/ManageOrder.blade.php | 2 +- .../Modals/MessageAttendee.blade.php | 39 ++-- .../ManageEvent/Modals/MessageOrder.blade.php | 6 +- .../Modals/ResendTicketToAttendee.blade.php | 4 +- resources/views/ManageEvent/Orders.blade.php | 2 +- .../ManageEvent/Partials/TopNav.blade.php | 2 +- .../ManageEvent/PrintAttendees.blade.php | 2 +- .../views/ManageOrganiser/Dashboard.blade.php | 7 +- .../Partials/EventHeaderSection.blade.php | 10 +- .../Partials/EventViewOrderSection.blade.php | 7 +- 28 files changed, 220 insertions(+), 250 deletions(-) diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index e4464488..51d428ae 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -134,8 +134,8 @@ class EventAttendeesController extends MyBaseController $ticket_id = $request->get('ticket_id'); $event = Event::findOrFail($event_id); $ticket_price = 0; - $attendee_first_name = $request->get('first_name'); - $attendee_last_name = $request->get('last_name'); + $attendee_first_name = strip_tags($request->get('first_name')); + $attendee_last_name = strip_tags($request->get('last_name')); $attendee_email = $request->get('email'); $email_attendee = $request->get('email_ticket'); @@ -300,8 +300,8 @@ class EventAttendeesController extends MyBaseController foreach ($the_file as $rows) { if (!empty($rows['first_name']) && !empty($rows['last_name']) && !empty($rows['email'])) { $num_added++; - $attendee_first_name = $rows['first_name']; - $attendee_last_name = $rows['last_name']; + $attendee_first_name = strip_tags($rows['first_name']); + $attendee_last_name = strip_tags($rows['last_name']); $attendee_email = $rows['email']; error_log($ticket_id . ' ' . $ticket_price . ' ' . $email_attendee); diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index 99de477c..ebd5c2ab 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -14,8 +14,9 @@ class Ticket extends MyBaseModel * @var array $rules */ public $rules = [ - 'title' => ['required'], + 'title' => ['required','alpha_dash'], 'price' => ['required', 'numeric', 'min:0'], + 'description' => ['alpha_dash'], 'start_sale_date' => ['date'], 'end_sale_date' => ['date', 'after:start_sale_date'], 'quantity_available' => ['integer', 'min:0'], diff --git a/resources/lang/en/Event.php b/resources/lang/en/Event.php index 6935caa9..71f6c8ad 100644 --- a/resources/lang/en/Event.php +++ b/resources/lang/en/Event.php @@ -4,10 +4,7 @@ *************************************************************************/ return array ( - //============================== New strings to translate ==============================// - // Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageOrganiser\\Modals\\CreateEvent.blade.php 'address_details' => 'Address Details', - //==================================== Translations ====================================// 'address_line_1' => 'Address Line 1', 'address_line_1_placeholder' => 'E.g: 45 Grafton St.', 'address_line_2' => 'Address Line 2', @@ -29,7 +26,7 @@ return array ( 'event_title' => 'Event Title', 'event_title_placeholder' => 'E.g: :name\'s Interational Conference', 'event_visibility' => 'Event Visibility', - 'n_attendees_for_event' => ':num Attendee(s) for event: :name (:date)', + 'n_attendees_for_event' => ':num Attendee(s) for event: :name (:date)', 'no_events_yet' => 'No Event Yet!', 'no_events_yet_text' => 'Looks like you have yet to create an event. You can create one by clicking the button below.', 'num_events' => ':num Events', @@ -40,7 +37,7 @@ return array ( 'promote_event' => 'Promote Event', 'revenue' => 'Revenue', 'save_changes' => 'Save Changes', - 'showing_num_of_orders' => 'Showing :0 orders out of :1 Total', + 'showing_num_of_orders' => 'Showing :0 orders out of :1 Total', 'tickets_sold' => 'Tickets Sold', 'venue_name' => 'Venue Name', 'venue_name_placeholder' => 'E.g: The Crab Shack', diff --git a/resources/lang/en/ManageEvent.php b/resources/lang/en/ManageEvent.php index 10b54ddc..1ccae0a0 100644 --- a/resources/lang/en/ManageEvent.php +++ b/resources/lang/en/ManageEvent.php @@ -1,10 +1,6 @@ 'All Attendees', 'all_attendees_cancelled' => 'All attendees in this order have been cancelled.', 'all_order_refunded' => 'All :money of this order has been refunded.', @@ -13,13 +9,13 @@ return array ( 'attendee_cancelled_help' => 'This attendee has been cancelled', 'attendees_file_requirements' => 'File must be .csv and the first line must contain first_name,last_name,email', 'attendize_qrcode_check_in' => 'Attendize QRCode Check-in', - 'cancel_attendee_title' => 'Cancel :cancel', + 'cancel_attendee_title' => 'Cancel :cancel', 'cancel_description' => 'Cancelling Attendees will remove them from the attendee list.', - 'cancel_notify' => 'Notify :name their ticket has been cancelled.', - 'cancel_order_:ref' => 'Cancel Order: :ref', - 'cancel_refund' => 'If you would like to refund the order which this attendee belongs to you can do so here.', - 'cancel_refund_user' => 'Refund :name for their ticket.', - 'cant_refund_here' => 'Sorry, you can\'t refund :gateway payments here. You will have to do it on their website.', + 'cancel_notify' => 'Notify :name their ticket has been cancelled.', + 'cancel_order_:ref' => 'Cancel Order: :ref', + 'cancel_refund' => 'If you would like to refund the order which this attendee belongs to you can do so here.', + 'cancel_refund_user' => 'Refund :name for their ticket.', + 'cant_refund_here' => 'Sorry, you can\'t refund :gateway payments here. You will have to do it on their website.', 'check-in' => 'Check-In', 'checkin_search_placeholder' => 'Search by Attendee Name, Order Reference, Attendee Reference...', 'close' => 'close', @@ -29,12 +25,12 @@ return array ( 'create_ticket' => 'Create Ticket', 'download_pdf_ticket' => 'Download PDF Ticket', 'edit_attendee' => 'Edit Attendee', - 'edit_attendee_title' => 'Edit :attendee', - 'edit_order_title' => 'Order: :order_ref', + 'edit_attendee_title' => 'Edit :attendee', + 'edit_order_title' => 'Order: :order_ref', 'edit_question' => 'Edit Question', 'edit_ticket' => 'Edit Ticket', 'end_sale_on' => 'End Sale On', - 'event_not_live_with_activate' => 'This event is not visible to the public. Publish it', + 'event_not_live' => 'This event is not visible to the public.', 'event_page' => 'Event Page', 'event_tools' => 'Event Tools', 'export' => 'Export', @@ -45,7 +41,7 @@ return array ( 'invite_attendees' => 'Invite Attendees', 'issue_full_refund' => 'Issue full refund', 'issue_partial_refund' => 'Issue partial refund', - 'manage_order_title' => 'Order: :order_ref', + 'manage_order_title' => 'Order: :order_ref', 'mark_payment_received' => 'Mark Payment Received', 'maximum_tickets_per_order' => 'Maximum Tickets Per Order', 'message_attendee_title' => 'Message :attendee', @@ -59,7 +55,7 @@ return array ( 'no_attendees_yet_text' => 'Attendees will appear here once they successfully registered for your event, or, you can manually invite attendees yourself.', 'no_orders_yet' => 'No orders yet', 'no_orders_yet_text' => 'New orders will appear here as they are created.', - 'order_contact_will_receive_instructions' => 'The order contact will be instructed to send any reply to :email', + 'order_contact_will_receive_instructions' => 'The order contact will be instructed to send any reply to :email', 'order_details' => 'Order Details', 'order_overview' => 'Order Overview', 'order_ref' => 'Order: #:order_ref', @@ -67,13 +63,14 @@ return array ( 'price_placeholder' => 'E.g: 25.99', 'print_attendee_list' => 'Print Attendee List', 'print_tickets' => 'Print Tickets', + 'publish_it' => 'Publish it', 'qr_instructions' => 'Put the QR code in front of your Camera (Not too close)', 'quantity_available' => 'Quantity Available', 'quantity_available_placeholder' => 'E.g: 100 (Leave blank for unlimited)', 'refund_amount' => 'Refund amount', 'refund_this_order?' => 'Refund this order?', 'resend_ticket' => 'Resend Ticket', - 'resend_ticket_help' => 'The attendee will be sent another copy of their ticket to :email', + 'resend_ticket_help' => 'The attendee will be sent another copy of their ticket to :email', 'resend_ticket_to_attendee' => 'Resend Ticket to :attendee', 'resend_tickets' => 'Resend Tickets', 'result_for' => 'result(s) for', @@ -95,7 +92,6 @@ return array ( 'ticket_title_placeholder' => 'E.g: General Admission', 'update_order' => 'Update Order', 'widgets' => 'Widgets', - //================================== Obsolete strings ==================================// 'LLH:obsolete' => array ( 'create_question' => 'Create Question', diff --git a/resources/lang/en/Message.php b/resources/lang/en/Message.php index 811908db..9c31ca0f 100644 --- a/resources/lang/en/Message.php +++ b/resources/lang/en/Message.php @@ -1,22 +1,18 @@ 'New Message', - // Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageEvent\\Modals\\MessageAttendees.blade.php 'sent_messages' => 'Sent Messages', - //==================================== Translations ====================================// 'all_event_attendees' => 'All event attendees', 'attendees_with_ticket_type' => 'Attendees with ticket type', - 'before_send_message' => 'The attendee will be instructed to send any reply to :recipient', + 'before_send_message' => 'The attendee will be instructed to send any reply to :organiser', 'content' => 'Message Content', 'date' => 'date', 'leave_blank_to_send_immediately' => 'Leave blank to send immediately', 'message' => 'Message', 'no_messages_for_event' => 'No messages for the event.', 'schedule_send_time' => 'Schedule send time', - 'send_a_copy_to' => 'Send a copy to', + 'send_a_copy_to' => 'Send a copy to :organiser', 'send_message' => 'Send Message', 'send_to' => 'Send to', 'subject' => 'Message Subject', diff --git a/resources/lang/en/Order.php b/resources/lang/en/Order.php index 9a9543f2..095d9ecd 100644 --- a/resources/lang/en/Order.php +++ b/resources/lang/en/Order.php @@ -1,17 +1,9 @@ 'amount_refunded', - // Defined in file C:\\wamp\\www\\attendize\\app\\Http\\Controllers\\EventOrdersController.php - 'fully_refunded' => 'fully_refunded', - // Defined in file C:\\wamp\\www\\attendize\\app\\Http\\Controllers\\EventOrdersController.php - 'partially_refunded' => 'partially_refunded', - //==================================== Translations ====================================// + 'amount_refunded' => 'amount refunded', + 'fully_refunded' => 'fully refunded', + 'partially_refunded' => 'partially refunded', 'after_order' => 'Message to display to attendees after they have completed their order.', 'after_order_help' => 'This message will be displayed to attendees once they have successfully completed the checkout process.', 'amount' => 'Amount', @@ -44,12 +36,13 @@ return array ( 'recent_orders' => 'Recent Orders', 'reference' => 'Reference', 'refund/cancel' => 'Refund / Cancel', + 'registered' => 'registered', 'status' => 'Status', 'sub_total' => 'Sub Total', 'ticket' => 'Ticket', + 'tickets' => 'tickets(s)', 'total' => 'Total', 'transaction_id' => 'Transaction ID', - 'user_registered_n_tickets' => ':name registered :n ticket(s).', 'view_order' => 'View Order', 'view_order_num' => 'View Order #:num', ); \ No newline at end of file diff --git a/resources/lang/en/Public_ViewEvent.php b/resources/lang/en/Public_ViewEvent.php index 51375153..b5de9659 100644 --- a/resources/lang/en/Public_ViewEvent.php +++ b/resources/lang/en/Public_ViewEvent.php @@ -1,10 +1,6 @@ 'Contact', 'DETAILS' => 'DETAILS', 'Facebook' => 'Facebook', @@ -22,11 +18,11 @@ return array ( 'booking_fees' => 'Booking Fees', 'card_number' => 'Card number', 'checkout_submit' => 'Checkout', + 'confirmation_email' => 'and a confirmation email have been sent to you.', 'copy_buyer' => 'Copy buyer details to all ticket holders', 'currently_not_on_sale' => 'Currently Not On Sale', 'cvc_number' => 'CVC number', 'date' => 'Date', - 'download_links' => 'Your tickets and a confirmation email have been sent to you.', 'download_tickets' => 'Download Tickets', 'email' => 'Email', 'email_address' => 'Email address', @@ -70,7 +66,7 @@ return array ( 'ticket_holder_information' => 'Ticket Holder Information', 'ticket_holder_n' => 'Ticket Holder :n Details', 'ticket_price' => 'Ticket Price', - 'tickets' => 'Tickets', + 'tickets' => 'Ticket(s)', 'tickets_are_currently_unavailable' => 'Tickets are currently unavailable', 'time' => 'Please note you only have :time to complete this transaction before your tickets are re-released.', 'total' => 'Total', @@ -78,4 +74,5 @@ return array ( 'your_information' => 'Your information', 'your_message' => 'Your message', 'your_name' => 'Your name', + 'your' => 'Your' ); \ No newline at end of file diff --git a/resources/lang/en/User.php b/resources/lang/en/User.php index a6001aff..04e0350a 100644 --- a/resources/lang/en/User.php +++ b/resources/lang/en/User.php @@ -1,13 +1,7 @@ 'Already have account? Sign In', - //==================================== Translations ====================================// 'after_welcome' => 'Before you continue please update your account with your name and a new password.', 'change_password' => 'Change Password', 'confirm_new_password' => 'Confirm New Password', diff --git a/resources/lang/pl/Event.php b/resources/lang/pl/Event.php index 9c3fb5a7..f7903ba8 100644 --- a/resources/lang/pl/Event.php +++ b/resources/lang/pl/Event.php @@ -4,10 +4,7 @@ *************************************************************************/ return array ( - //============================== New strings to translate ==============================// - // Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageOrganiser\\Modals\\CreateEvent.blade.php 'address_details' => 'Dokładny Adres', - //==================================== Translations ====================================// 'address_line_1' => 'Adres 1', 'address_line_1_placeholder' => 'Np.: ul. Kwiatowa 21', 'address_line_2' => 'Adres 2', @@ -29,7 +26,7 @@ return array ( 'event_title' => 'Tytuł Wydarzenia', 'event_title_placeholder' => 'Np.: Międzynarodowa Konferencja :name', 'event_visibility' => 'Widoczność Wydarzenia', - 'n_attendees_for_event' => ':num uczetnik(ów) wydarzenia: :name (:date)', + 'n_attendees_for_event' => ':num uczetnik(ów) wydarzenia: :name (:date)', 'no_events_yet' => 'Brak Wydarzeń', 'no_events_yet_text' => 'Wygląda na to, że jeszcze nie ma utworzonych wydarzeń. Możesz je utworzyć klikając przycisk niżej.', 'num_events' => ':num Wydarzeń', @@ -40,7 +37,7 @@ return array ( 'promote_event' => 'Promuj Wydarzenie', 'revenue' => 'Zysk', 'save_changes' => 'Zapisz Zmiany', - 'showing_num_of_orders' => 'Wyświetlam :0/:1 zamówień', + 'showing_num_of_orders' => 'Wyświetlam :0/:1 zamówień', 'tickets_sold' => 'Sprzedanych Biletów', 'venue_name' => 'Nazwa lokalu', 'venue_name_placeholder' => 'Np.: Krabowa Chata', diff --git a/resources/lang/pl/ManageEvent.php b/resources/lang/pl/ManageEvent.php index 82b74952..6f6ce734 100644 --- a/resources/lang/pl/ManageEvent.php +++ b/resources/lang/pl/ManageEvent.php @@ -1,7 +1,6 @@ 'Wszyscy Uczestnicy', 'all_attendees_cancelled' => 'Wszyscy uczestnicy z tego zamówienia zostali anulowani.', 'all_order_refunded' => 'Cała kwota :money z tego zamówienia została zwrócona.', @@ -10,13 +9,13 @@ return array ( 'attendee_cancelled_help' => 'Ten uczestnik został anulowany', 'attendees_file_requirements' => 'Plik musi być w formacie .csv a pierwsza linia pliku musi zawierać frazę first_name,last_name,email', 'attendize_qrcode_check_in' => 'Lista Uczetników Attendize z kodami QR', - 'cancel_attendee_title' => 'Anuluj :cancelb>', + 'cancel_attendee_title' => 'Anuluj :cancel', 'cancel_description' => 'Anulując uczestnika usuniesz go z listy uczestników.', - 'cancel_notify' => 'Powiadom :name, że ich bilet jest anulowany.', - 'cancel_order_:ref' => 'Anuluj zamówienie: :ref', - 'cancel_refund' => 'Jeżeli chcesz dokonać refundacji zamówienia, do którego należy ten uczestnik, możesz to zrobić tutaj.', - 'cancel_refund_user' => 'Zwróć uczestnikowi :name za ich bilet.', - 'cant_refund_here' => 'Przepraszamy, nie ma możliwości zwrotów w bramce płatnościowej :gateway. Musisz tego dokonać przez ich stronę.', + 'cancel_notify' => 'Powiadom :name, że ich bilet jest anulowany.', + 'cancel_order_:ref' => 'Anuluj zamówienie: :ref', + 'cancel_refund' => 'Jeżeli chcesz dokonać refundacji zamówienia, do którego należy ten uczestnik, możesz to zrobić tutaj.', + 'cancel_refund_user' => 'Zwróć uczestnikowi :name za ich bilet.', + 'cant_refund_here' => 'Przepraszamy, nie ma możliwości zwrotów w bramce płatnościowej :gateway. Musisz tego dokonać przez ich stronę.', 'check-in' => 'Lista Uczestników', 'checkin_search_placeholder' => 'Wyszukaj po nazwisku uczestnika, numerze zamówienia, numerze uczestnika...', 'close' => 'Zamknij', @@ -26,12 +25,12 @@ return array ( 'create_ticket' => 'Utwórz Bilet', 'download_pdf_ticket' => 'Pobierz Bilet (PDF)', 'edit_attendee' => 'Edytuj Uczestnika', - 'edit_attendee_title' => 'Edytuj :attendee', - 'edit_order_title' => 'Zamówienie: :order_ref', + 'edit_attendee_title' => 'Edytuj :attendee', + 'edit_order_title' => 'Zamówienie: :order_ref', 'edit_question' => 'Edytuj Pytanie', 'edit_ticket' => 'Edytuj Bilet', 'end_sale_on' => 'Zakończenie Sprzedaży', - 'event_not_live_with_activate' => 'To wydarzenie nie jest publiczne. Opublikuj', + 'event_not_live' => 'To wydarzenie nie jest publiczne.', 'event_page' => 'Strona Wydarzenia', 'event_tools' => 'Narzędzia Wydarzenia', 'export' => 'Eksport', @@ -42,7 +41,7 @@ return array ( 'invite_attendees' => 'Zaproś uczestników', 'issue_full_refund' => 'Rozpocznij Pełną Refundację', 'issue_partial_refund' => 'Rozpocznij Niepełną Refundację', - 'manage_order_title' => 'Zamówienie: :order_ref', + 'manage_order_title' => 'Zamówienie: :order_ref', 'mark_payment_received' => 'Oznacz jako opłacone', 'maximum_tickets_per_order' => 'Maksymalna Biletów / Zamówienie', 'message_attendee_title' => 'Napisz do :attendee', @@ -56,7 +55,7 @@ return array ( 'no_attendees_yet_text' => 'Uczestnicy pojawią się automatycznie, gdy zarezerwują swoje bilety, lub gdy wyślesz zaproszenia ręcznie.', 'no_orders_yet' => 'Brak zamówień', 'no_orders_yet_text' => 'Nowe zamówienia pojawią się, jak tylko zostaną złożone.', - 'order_contact_will_receive_instructions' => 'Kontakt z zamówienia zostanie poinformowany o możliwości odpowiedzi na email :email', + 'order_contact_will_receive_instructions' => 'Kontakt z zamówienia zostanie poinformowany o możliwości odpowiedzi na email :email', 'order_details' => 'Szczegóły Zamówienia', 'order_overview' => 'Przegląd Zamówienia', 'order_ref' => 'Zamówienie: #:order_ref', @@ -64,13 +63,14 @@ return array ( 'price_placeholder' => 'Np.: 25.99', 'print_attendee_list' => 'Wydrukuj listę uczestników', 'print_tickets' => 'Wydrukuj Bilety', + 'publish_it' => 'Opublikuj', 'qr_instructions' => 'Umieść kod QR przed kamerę (nie za blisko)', 'quantity_available' => 'Liczba biletów', 'quantity_available_placeholder' => 'Np.: 100 (Pozostaw puste dla nielimitowanej)', 'refund_amount' => 'Kwota Zwrotu', 'refund_this_order?' => 'Refundujesz?', 'resend_ticket' => 'Prześlij Bilet Ponownie', - 'resend_ticket_help' => 'Uczestnik otrzyma dodatkową kopię biletu na adres :email', + 'resend_ticket_help' => 'Uczestnik otrzyma dodatkową kopię biletu na adres :email', 'resend_ticket_to_attendee' => 'Prześlij bilet ponownie do :attendee', 'resend_tickets' => 'Ponowna przesyłka biletu', 'result_for' => 'wynik(ów) dla', diff --git a/resources/lang/pl/Message.php b/resources/lang/pl/Message.php index 3e3b5473..401f371d 100644 --- a/resources/lang/pl/Message.php +++ b/resources/lang/pl/Message.php @@ -1,22 +1,18 @@ 'Nowa Wiadomość', - // Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageEvent\\Modals\\MessageAttendees.blade.php 'sent_messages' => 'Wysłane Wiadomości', - //==================================== Translations ====================================// 'all_event_attendees' => 'Wszyscy członkowie wydarzenia', 'attendees_with_ticket_type' => 'Uczestnicy z biletem', - 'before_send_message' => 'Uczestnik zostanie poinstruowany o możliwości odpowiedzi na adres :recipient', + 'before_send_message' => 'Uczestnik zostanie poinstruowany o możliwości odpowiedzi na adres :organiser', 'content' => 'Treść wiadomości', 'date' => 'data', 'leave_blank_to_send_immediately' => 'Pozostaw puste, aby wysłać teraz', 'message' => 'Wiadomość', 'no_messages_for_event' => 'Brak wiadomości związanych z tym wydarzeniem.', 'schedule_send_time' => 'Wyslij później', - 'send_a_copy_to' => 'Wyślij kopię do', + 'send_a_copy_to' => 'Wyślij kopię do :organiser', 'send_message' => 'Wyślij wiadomość', 'send_to' => 'Wyślij do', 'subject' => 'Temat', diff --git a/resources/lang/pl/Order.php b/resources/lang/pl/Order.php index 66966976..f4d32029 100644 --- a/resources/lang/pl/Order.php +++ b/resources/lang/pl/Order.php @@ -1,17 +1,9 @@ 'amount_refunded', - // Defined in file C:\\wamp\\www\\attendize\\app\\Http\\Controllers\\EventOrdersController.php - 'fully_refunded' => 'fully_refunded', - // Defined in file C:\\wamp\\www\\attendize\\app\\Http\\Controllers\\EventOrdersController.php - 'partially_refunded' => 'partially_refunded', - //==================================== Translations ====================================// + 'amount_refunded' => 'kwota zwrócona', + 'fully_refunded' => 'w pełni refundowany', + 'partially_refunded' => 'częściowo zwrócone', 'after_order' => 'Wiadomość po ukończonym zamówieniu.', 'after_order_help' => 'Ta wiadomość będzie wyświetlana uczestnikom po ukończonym procesie zamówienia.', 'amount' => 'Kwota', @@ -44,12 +36,13 @@ return array ( 'recent_orders' => 'Recent Orders', 'reference' => 'Numer', 'refund/cancel' => 'Refunduj/Anuluj', + 'registered' => 'zarejestrowany', 'status' => 'Status', 'sub_total' => 'Suma', 'ticket' => 'Bilet', + 'tickets' => 'Bilety', 'total' => 'Razem', 'transaction_id' => 'Identyfikator transakcji', - 'user_registered_n_tickets' => ':name zarezerwował :n bilet(ów).', 'view_order' => 'Podgląd Zamówienia', 'view_order_num' => 'Podgląd Zamówienia #:num', ); \ No newline at end of file diff --git a/resources/lang/pl/Public_ViewEvent.php b/resources/lang/pl/Public_ViewEvent.php index 15b36a1a..7c4ac4cc 100644 --- a/resources/lang/pl/Public_ViewEvent.php +++ b/resources/lang/pl/Public_ViewEvent.php @@ -1,10 +1,6 @@ 'Kontakt', 'DETAILS' => 'SZCZEGÓŁY', 'Facebook' => 'Facebook', @@ -22,11 +18,11 @@ return array ( 'booking_fees' => 'Opłaty rezerwacyjne', 'card_number' => 'Numer karty', 'checkout_submit' => 'Podsumowanie', + 'confirmation_email' => 'i e-mail z potwierdzeniem został wysłany do ciebie.', 'copy_buyer' => 'Przekopiuj dane kupującego na wszystkie bilety', 'currently_not_on_sale' => 'Aktualnie nie w sprzedaży', 'cvc_number' => 'Numer CVC', 'date' => 'Data', - 'download_links' => 'Twoje bilety i email z potwierdzeniem zostały wysłane.', 'download_tickets' => 'Pobierz bilety', 'email' => 'Email', 'email_address' => 'Adres email', @@ -78,4 +74,5 @@ return array ( 'your_information' => 'Twoje dane', 'your_message' => 'Twoja wiadomość', 'your_name' => 'Twoje imię', + 'your' => 'Twój', ); \ No newline at end of file diff --git a/resources/lang/pl/User.php b/resources/lang/pl/User.php index 46987f33..e281aa25 100644 --- a/resources/lang/pl/User.php +++ b/resources/lang/pl/User.php @@ -1,13 +1,7 @@ 'Masz już konto? Zaloguj się!', - //==================================== Translations ====================================// 'after_welcome' => 'Zanim będziemy kontynuować, zaktualizuj swoje konto o dane kontaktowe i hasło.', 'change_password' => 'Zmień Hasło', 'confirm_new_password' => 'Potwierdź Nowe Hasło', diff --git a/resources/views/ManageEvent/Modals/CancelAttendee.blade.php b/resources/views/ManageEvent/Modals/CancelAttendee.blade.php index 0e7b8085..b9155f50 100644 --- a/resources/views/ManageEvent/Modals/CancelAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/CancelAttendee.blade.php @@ -6,11 +6,11 @@

- {!! @trans("ManageEvent.cancel_attendee_title", ["cancel" => $attendee->full_name]) !!}

+ {{ @trans("ManageEvent.cancel_attendee_title", ["cancel" => $attendee->full_name]) }}

- @lang("ManageEvent.cancel_description") + {{ @trans("ManageEvent.cancel_description") }}

@@ -20,14 +20,14 @@

- +
@if(config('attendize.default_payment_gateway') == config('attendize.payment_gateway_stripe'))
- +
@endif diff --git a/resources/views/ManageEvent/Modals/CancelOrder.blade.php b/resources/views/ManageEvent/Modals/CancelOrder.blade.php index e1b19184..5246ea92 100644 --- a/resources/views/ManageEvent/Modals/CancelOrder.blade.php +++ b/resources/views/ManageEvent/Modals/CancelOrder.blade.php @@ -1,5 +1,6 @@ - + + + @lang("ManageEvent.select_all") + + + @foreach($attendees as $attendee) - - - @if(!$attendee->is_cancelled) - {!!Form::checkbox('attendees[]', $attendee->id, false, ['class' => 'attendee-check'])!!} - @endif - - - {{$attendee->first_name}} - {{$attendee->last_name}} - - - {{$attendee->email}} - - - {{{$attendee->ticket->title}}} - {{{$order->order_reference}}}-{{{$attendee->reference_index}}} - - - @endforeach - - -
+ + + @if(!$attendee->is_cancelled) + {!!Form::checkbox('attendees[]', $attendee->id, false, ['class' => + 'attendee-check'])!!} + @endif + + + {{$attendee->first_name}} + {{$attendee->last_name}} + + + {{$attendee->email}} + + + {{{$attendee->ticket->title}}} + {{{$order->order_reference}}}-{{{$attendee->reference_index}}} + + + @endforeach + + + @else -
- @lang("ManageEvent.all_attendees_cancelled") -
+
+ @lang("ManageEvent.all_attendees_cancelled") +
@endif @if($order->transaction_id) - @if($order->payment_gateway->can_refund) + @if($order->payment_gateway->can_refund)
@if(!$order->is_refunded) -
-
-
- -
+
+
+
+
+
-
-
+
+
-
-
-
- {!!Form::radio('refund_type', 'full', ['selected' => 'selected'])!!} -
+
+
+
+ {!!Form::radio('refund_type', 'full', ['selected' => 'selected'])!!}
-
- @lang("ManageEvent.issue_full_refund") +
+
+ @lang("ManageEvent.issue_full_refund") -
- Refund the - entire {{(money($order->organiser_amount - $order->amount_refunded, $order->event->currency))}} -
+
+ Refund the + entire {{(money($order->organiser_amount - $order->amount_refunded, + $order->event->currency))}}
+
-
-
-
-
- {!!Form::radio('refund_type', 'partial')!!} -
+
+
+
+
+ {!!Form::radio('refund_type', 'partial')!!}
-
- @lang("ManageEvent.issue_partial_refund") +
+
+ @lang("ManageEvent.issue_partial_refund") -
-
-
- @lang("ManageEvent.refund_amount"): -
-
- -
+
+
+
+ @lang("ManageEvent.refund_amount"): +
+
+
@@ -157,30 +160,33 @@
+
@else -
- @lang("ManageEvent.all_order_refunded", ["money"=>money($order->amount_refunded, $order->event->currency)]) -
+
+ @lang("ManageEvent.all_order_refunded", ["money"=>money($order->amount_refunded, + $order->event->currency)]) +
@endif
- @else -
- {!! @trans("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name]) !!} -
- @endif + @else +
+ {{ @trans("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name]) }} +
+ @endif @endif
@if($attendees->count() || !$order->is_refunded) -
- {!! Form::button(trans("basic.cancel"), ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!} - {!! Form::submit(trans("ManageEvent.confirm_order_cancel"), ['class'=>"btn btn-primary"]) !!} -
+
+ {!! Form::button(trans("basic.cancel"), ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) + !!} + {!! Form::submit(trans("ManageEvent.confirm_order_cancel"), ['class'=>"btn btn-primary"]) !!} +
@endif
{!! Form::close() !!} diff --git a/resources/views/ManageEvent/Modals/EditAttendee.blade.php b/resources/views/ManageEvent/Modals/EditAttendee.blade.php index b054b6bb..fa830c7c 100644 --- a/resources/views/ManageEvent/Modals/EditAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/EditAttendee.blade.php @@ -6,7 +6,7 @@

- {!! @trans("ManageEvent.edit_attendee_title", ["attendee"=> strip_tags($attendee->full_name) ]) !!} + {{ @trans("ManageEvent.edit_attendee_title", ["attendee"=> $attendee->full_name]) }}

diff --git a/resources/views/ManageEvent/Modals/EditOrder.blade.php b/resources/views/ManageEvent/Modals/EditOrder.blade.php index b236db6b..b9a1a1f9 100644 --- a/resources/views/ManageEvent/Modals/EditOrder.blade.php +++ b/resources/views/ManageEvent/Modals/EditOrder.blade.php @@ -15,7 +15,7 @@

- {!! @trans("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference]) !!} + {{ @trans("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference]) }}

diff --git a/resources/views/ManageEvent/Modals/ManageOrder.blade.php b/resources/views/ManageEvent/Modals/ManageOrder.blade.php index ef024327..f47a8dea 100644 --- a/resources/views/ManageEvent/Modals/ManageOrder.blade.php +++ b/resources/views/ManageEvent/Modals/ManageOrder.blade.php @@ -11,7 +11,7 @@

- {!! @trans("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference]) !!} + {{ @trans("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference]) }}

diff --git a/resources/views/ManageEvent/Modals/MessageAttendee.blade.php b/resources/views/ManageEvent/Modals/MessageAttendee.blade.php index 0712baa4..be6269ca 100644 --- a/resources/views/ManageEvent/Modals/MessageAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/MessageAttendee.blade.php @@ -1,5 +1,6 @@ - diff --git a/resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php b/resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php index 91f5f167..99f44638 100644 --- a/resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php @@ -6,12 +6,12 @@

- @lang("ManageEvent.resend_ticket_to_attendee", ["attendee"=>$attendee->full_name]) + {{ @trans("ManageEvent.resend_ticket_to_attendee", ["attendee" => $attendee->full_name]) }}

- {!! @trans("ManageEvent.resend_ticket_help", ["email"=>$attendee->email]) !!} + {{ @trans("ManageEvent.resend_ticket_help", ["email" => $attendee->email]) }}
diff --git a/resources/views/ManageEvent/Orders.blade.php b/resources/views/ManageEvent/Orders.blade.php index 94443b1d..91de17c0 100644 --- a/resources/views/ManageEvent/Orders.blade.php +++ b/resources/views/ManageEvent/Orders.blade.php @@ -18,7 +18,7 @@ @lang("Event.event_orders") - {!! @trans("Event.showing_num_of_orders", [30, \App\Models\Order::scope()->count()]) !!} + {{ @trans("Event.showing_num_of_orders", [30, \App\Models\Order::scope()->count()]) }} @stop diff --git a/resources/views/ManageEvent/Partials/TopNav.blade.php b/resources/views/ManageEvent/Partials/TopNav.blade.php index 87c17788..af725a0f 100644 --- a/resources/views/ManageEvent/Partials/TopNav.blade.php +++ b/resources/views/ManageEvent/Partials/TopNav.blade.php @@ -6,7 +6,7 @@ }
- {!! @trans("ManageEvent.event_not_live_with_activate", ["url"=>route('MakeEventLive', ['event_id' => $event->id])]) !!} . + @trans("ManageEvent.event_not_live_with_activate", ["url"=>route('MakeEventLive', ['event_id' => $event->id])]) .
@endif @stop diff --git a/resources/views/ManageEvent/PrintAttendees.blade.php b/resources/views/ManageEvent/PrintAttendees.blade.php index 8a9f4409..ae37354a 100644 --- a/resources/views/ManageEvent/PrintAttendees.blade.php +++ b/resources/views/ManageEvent/PrintAttendees.blade.php @@ -19,7 +19,7 @@
- {!! @trans("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->toDayDateTimeString()]) !!} + {{ @trans("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->toDayDateTimeString()]) }}
diff --git a/resources/views/ManageOrganiser/Dashboard.blade.php b/resources/views/ManageOrganiser/Dashboard.blade.php index e4ddb105..ca2bdcd2 100644 --- a/resources/views/ManageOrganiser/Dashboard.blade.php +++ b/resources/views/ManageOrganiser/Dashboard.blade.php @@ -119,9 +119,10 @@

#{{ $order->order_reference }} - - {!! @trans("Order.user_registered_n_tickets", ["name"=>$order->full_name, - "url"=>route('showEventAttendees', ['event_id'=>$order->event->id,'q'=>$order->order_reference]), - "n"=>$order->attendees()->withTrashed()->count()]) !!} + + {{ $order->full_name }} + {{ @trans("Order.registered") }} + {{ $order->attendees()->withTrashed()->count() }} {{ @trans("Order.tickets") }}

{{ $order->created_at->diffForHumans() }} • is_live)
- @if(!$event->is_live) - @lang("ManageEvent.event_not_live_with_activate", ["style"=>'style="background-color: green; border-color: green;" class="btn btn-success btn-xs"', "url"=>route('MakeEventLive' , ['event_id' => $event->id])]) - @endif + @if(!$event->is_live) + + {{ @trans("ManageEvent.event_not_live") }} + {{ @trans("ManageEvent.publish_it") }} + @endif
@endif diff --git a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php index f3d0ffbb..7d760a9f 100644 --- a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php +++ b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php @@ -53,9 +53,12 @@ -

{!! @trans("Public_ViewEvent.thank_you_for_your_order") !!}

+

{{ @trans("Public_ViewEvent.thank_you_for_your_order") }}

- {!! @trans("Public_ViewEvent.download_links", ["title" => trans("Public_ViewEvent.download_tickets"), "url"=>route('showOrderTickets', ['order_reference' => $order->order_reference])."?download=1"]) !!} + {{ @trans("Public_ViewEvent.your") }} + + {{ @trans("Public_ViewEvent.tickets") }} {{ @trans("Public_ViewEvent.confirmation_email") }}

From 3868bd4e9ee15fb760c69c558525bc5afacfb743 Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Sat, 29 Sep 2018 15:32:14 +0200 Subject: [PATCH 09/12] Fixed small publish event link --- resources/views/ManageEvent/Partials/TopNav.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/ManageEvent/Partials/TopNav.blade.php b/resources/views/ManageEvent/Partials/TopNav.blade.php index af725a0f..741af4e5 100644 --- a/resources/views/ManageEvent/Partials/TopNav.blade.php +++ b/resources/views/ManageEvent/Partials/TopNav.blade.php @@ -6,7 +6,8 @@ }
- @trans("ManageEvent.event_not_live_with_activate", ["url"=>route('MakeEventLive', ['event_id' => $event->id])]) . + {{ @trans("ManageEvent.event_not_live") }} + {{ @trans("ManageEvent.publish_it") }}
@endif @stop From 861c2f5434c6eb1afe268e4419aa799dcc61108e Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Tue, 2 Oct 2018 08:58:53 +0200 Subject: [PATCH 10/12] use strip tags instead of validator --- app/Models/Ticket.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index ebd5c2ab..d6ce98eb 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -14,9 +14,9 @@ class Ticket extends MyBaseModel * @var array $rules */ public $rules = [ - 'title' => ['required','alpha_dash'], + 'title' => ['required'], 'price' => ['required', 'numeric', 'min:0'], - 'description' => ['alpha_dash'], + 'description' => [], 'start_sale_date' => ['date'], 'end_sale_date' => ['date', 'after:start_sale_date'], 'quantity_available' => ['integer', 'min:0'], From 7772df330039aa38989be09c13863b78f6bb9097 Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Tue, 2 Oct 2018 09:50:26 +0200 Subject: [PATCH 11/12] added strip tags --- app/Http/Controllers/EventTicketsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/EventTicketsController.php b/app/Http/Controllers/EventTicketsController.php index c00580cc..cb58ac47 100644 --- a/app/Http/Controllers/EventTicketsController.php +++ b/app/Http/Controllers/EventTicketsController.php @@ -99,7 +99,7 @@ class EventTicketsController extends MyBaseController } $ticket->event_id = $event_id; - $ticket->title = $request->get('title'); + $ticket->title = strip_tags($request->get('title')); $ticket->quantity_available = !$request->get('quantity_available') ? null : $request->get('quantity_available'); $ticket->start_sale_date = $request->get('start_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('start_sale_date')) : null; @@ -108,7 +108,7 @@ class EventTicketsController extends MyBaseController $ticket->price = $request->get('price'); $ticket->min_per_person = $request->get('min_per_person'); $ticket->max_per_person = $request->get('max_per_person'); - $ticket->description = $request->get('description'); + $ticket->description = strip_tags($request->get('description')); $ticket->is_hidden = $request->get('is_hidden') ? 1 : 0; $ticket->save(); From 287881b64c6f3ee72ae1499539dc4835c6800d1c Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Tue, 2 Oct 2018 12:15:20 +0200 Subject: [PATCH 12/12] add self signed cert to ngix --- Dockerfile-nginx | 6 ++++++ docker-compose.yml | 1 + nginx.conf | 7 +++++++ self-signed.conf | 2 ++ ssl-params.conf | 21 +++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 self-signed.conf create mode 100644 ssl-params.conf diff --git a/Dockerfile-nginx b/Dockerfile-nginx index 8fe57077..a9c6196b 100644 --- a/Dockerfile-nginx +++ b/Dockerfile-nginx @@ -1,2 +1,8 @@ FROM nginx:latest COPY nginx.conf /etc/nginx/conf.d/default.conf +RUN apt-get update && apt-get install openssl +RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt -subj "/C=GB/ST=London/L=London/O=NA/CN=localhost" +RUN openssl dhparam -out /etc/ssl/certs/dhparam.pem 2048 +RUN mkdir /etc/nginx/snippets +COPY self-signed.conf /etc/nginx/snippets/self-signed.conf +COPY ssl-params.conf /etc/nginx/snippets/ssl-params.conf diff --git a/docker-compose.yml b/docker-compose.yml index 957b2f69..d9d31683 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ services: - ./.env ports: - "8080:80" + - "8081:443" networks: - attendizenet volumes: diff --git a/nginx.conf b/nginx.conf index c7c665b0..dc48bb3e 100644 --- a/nginx.conf +++ b/nginx.conf @@ -2,6 +2,13 @@ server { listen 80 default_server; server_name localhost; + listen 443 ssl http2 default_server; + listen [::]:443 ssl http2 default_server; + + include snippets/self-signed.conf; + include snippets/ssl-params.conf; + + root /usr/share/nginx/html/attendize/public; index index.php; diff --git a/self-signed.conf b/self-signed.conf new file mode 100644 index 00000000..39332d77 --- /dev/null +++ b/self-signed.conf @@ -0,0 +1,2 @@ +ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt; +ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key; \ No newline at end of file diff --git a/ssl-params.conf b/ssl-params.conf new file mode 100644 index 00000000..42e50b26 --- /dev/null +++ b/ssl-params.conf @@ -0,0 +1,21 @@ +# from https://cipherli.st/ +# and https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html + +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; +ssl_ecdh_curve secp384r1; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; +resolver 8.8.8.8 8.8.4.4 valid=300s; +resolver_timeout 5s; +# Disable preloading HSTS for now. You can use the commented out header line that includes +# the "preload" directive if you understand the implications. +#add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload"; +add_header Strict-Transport-Security "max-age=63072000; includeSubdomains"; +add_header X-Frame-Options DENY; +add_header X-Content-Type-Options nosniff; + +ssl_dhparam /etc/ssl/certs/dhparam.pem; \ No newline at end of file