Merge branch 'master' into improve-upstream

This commit is contained in:
Sebastian Schmidt 2018-10-02 21:23:17 +10:00
commit 7bae63a5e9
46 changed files with 321 additions and 287 deletions

View File

@ -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

View File

@ -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');
@ -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;
@ -300,8 +301,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);
@ -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
}

View File

@ -176,7 +176,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])
'name' => $attendee->first_name." ".$attendee->last_name,
'reference' => $attendee->reference,
'ticket' => $attendee->ticket
]);
}
}

View File

@ -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;

View File

@ -434,7 +434,7 @@ class EventOrdersController extends MyBaseController
]);
}
$order = Attendee::scope()->findOrFail($order_id);
$order = Order::scope()->findOrFail($order_id);
$data = [
'order' => $order,

View File

@ -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();

View File

@ -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');

View File

@ -16,10 +16,11 @@ class Ticket extends MyBaseModel
public $rules = [
'title' => ['required'],
'price' => ['required', 'numeric', 'min:0'],
'description' => [],
'start_sale_date' => ['date'],
'end_sale_date' => ['date', 'after:start_sale_date'],
'quantity_available' => ['integer', 'min:0'],
];
];
/**
* The validation error messages.
*

View File

@ -9,6 +9,7 @@ services:
- ./.env
ports:
- "8080:80"
- "8081:443"
networks:
- attendizenet
volumes:

View File

@ -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;

View File

@ -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");
});
},

View File

@ -216,6 +216,9 @@ footer {
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.63);
}
.uppercase {
text-transform: uppercase;
}

View File

@ -1,6 +1,6 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/19 17:07:35
Generated via "php artisan localization:missing" at 2018/04/19 17:07:35
*************************************************************************/
return array (
@ -16,6 +16,8 @@ return array (
'first_name' => '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.',
);
);

View File

@ -1,12 +1,12 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/26 10:21:11
Generated via "php artisan localization:missing" at 2018/04/26 10:21:11
*************************************************************************/
return array (
//============================== New strings to translate ==============================//
// Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageOrganiser\\Events.blade.php
'sort' =>
'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 !<br>Name: :name <br>Reference: :ref<br>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.',
),

View File

@ -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' => '<b>:num</b> Attendee(s) for event: <b>:name</b> (: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 <b>:1</b> 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',

View File

@ -1,10 +1,6 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/26 11:05:24
*************************************************************************/
return array (
//==================================== Translations ====================================//
'all_attendees' => '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 <b>:cancel</b>',
'cancel_attendee_title' => 'Cancel :cancel',
'cancel_description' => 'Cancelling Attendees will remove them from the attendee list.',
'cancel_notify' => 'Notify <b>:name</b> their ticket has been cancelled.',
'cancel_order_:ref' => 'Cancel Order: <b>:ref</b>',
'cancel_refund' => 'If you would like to refund the order which this attendee belongs to you can do so <a href=":url">here</a>.',
'cancel_refund_user' => 'Refund <b>:name</b> for their ticket.',
'cant_refund_here' => 'Sorry, you can\'t refund <b>:gateway</b> 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 <strong><a href=":url">here</a></strong>.',
'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 <b>:attendee<b>',
'edit_order_title' => 'Order: <b>:order_ref</b>',
'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. <a :style href=":url">Publish it</a>',
'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: <b>:order_ref</b>',
'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 <b>:email</b>',
'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 <b>:email</b>',
'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',

View File

@ -1,22 +1,18 @@
<?php
return array (
//============================== New strings to translate ==============================//
// Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageEvent\\Modals\\MessageAttendees.blade.php
'new_message' => '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 <b>:recipient</b>',
'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',

View File

@ -1,17 +1,9 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/25 15:38:13
*************************************************************************/
return array (
//============================== New strings to translate ==============================//
// Defined in file C:\\wamp\\www\\attendize\\app\\Http\\Controllers\\EventOrdersController.php
'amount_refunded' => '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' => '<a href=":url">:name</a> registered :n ticket(s).',
'view_order' => 'View Order',
'view_order_num' => 'View Order #:num',
);

View File

@ -1,10 +1,6 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/18 16:27:47
*************************************************************************/
return [
//==================================== Translations ====================================//
'Contact' => 'Contact',
'DETAILS' => 'DETAILS',
'Facebook' => 'Facebook',
@ -22,11 +18,11 @@ return [
'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 <a title=":title" class="ticket_download_link" href=":url">tickets</a> and a confirmation email have been sent to you.',
'download_tickets' => 'Download Tickets',
'email' => 'Email',
'email_address' => 'Email address',
@ -70,7 +66,7 @@ return [
'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 [
'your_information' => 'Your information',
'your_message' => 'Your message',
'your_name' => 'Your name',
'your' => 'Your'
];

View File

@ -1,13 +1,7 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/25 09:06:13
*************************************************************************/
return array (
//============================== New strings to translate ==============================//
// Defined in file C:\\wamp\\www\\attendize\\resources\\views\\Public\\LoginAndRegister\\Signup.blade.php
'already_have_account' => 'Already have account? <a class="semibold" href=":url">Sign In</a>',
//==================================== 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',

View File

@ -1,6 +1,6 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/19 17:07:35
Generated via "php artisan localization:missing" at 2018/04/19 17:07:35
*************************************************************************/
return array (
@ -15,7 +15,9 @@ return array (
'event_attendees' => '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.',
);
);

View File

@ -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 !<br>Imię: :name <br>Zamówienie: :ref<br>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',

View File

@ -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' => '<b>:num</b> uczetnik(ów) wydarzenia: <b>:name</b> (: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/<b>:1</b> 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',

View File

@ -1,7 +1,6 @@
<?php
return array (
//==================================== Translations ====================================//
'all_attendees' => '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 <b>:cancel</b>b>',
'cancel_attendee_title' => 'Anuluj :cancel',
'cancel_description' => 'Anulując uczestnika usuniesz go z listy uczestników.',
'cancel_notify' => 'Powiadom <b>:name</b>, że ich bilet jest anulowany.',
'cancel_order_:ref' => 'Anuluj zamówienie: <b>:ref</b>',
'cancel_refund' => 'Jeżeli chcesz dokonać refundacji zamówienia, do którego należy ten uczestnik, możesz to zrobić <a href=":url">tutaj</a>.',
'cancel_refund_user' => 'Zwróć uczestnikowi <b>:name</b> za ich bilet.',
'cant_refund_here' => 'Przepraszamy, nie ma możliwości zwrotów w bramce płatnościowej <b>:gateway</b>. 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ć <strong><a href=":url">tutaj</a></strong>.',
'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 <b>:attendee<b>',
'edit_order_title' => 'Zamówienie: <b>:order_ref</b>',
'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. <a :style href=":url">Opublikuj</a>',
'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: <b>:order_ref</b>',
'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 <b>:email</b>',
'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 <b>:email</b>',
'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',

View File

@ -1,22 +1,18 @@
<?php
return array (
//============================== New strings to translate ==============================//
// Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageEvent\\Modals\\MessageAttendees.blade.php
'new_message' => '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 <b>:recipient</b>',
'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',

View File

@ -1,17 +1,9 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/25 15:38:13
*************************************************************************/
return array (
//============================== New strings to translate ==============================//
// Defined in file C:\\wamp\\www\\attendize\\app\\Http\\Controllers\\EventOrdersController.php
'amount_refunded' => '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' => '<a href=":url">:name</a> zarezerwował :n bilet(ów).',
'view_order' => 'Podgląd Zamówienia',
'view_order_num' => 'Podgląd Zamówienia #:num',
);

View File

@ -1,10 +1,6 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/18 16:27:47
*************************************************************************/
return [
//==================================== Translations ====================================//
'Contact' => 'Kontakt',
'DETAILS' => 'SZCZEGÓŁY',
'Facebook' => 'Facebook',
@ -22,11 +18,11 @@ return [
'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 <a title=":title" class="ticket_download_link" href=":url">bilety</a> i email z potwierdzeniem zostały wysłane.',
'download_tickets' => 'Pobierz bilety',
'email' => 'Email',
'email_address' => 'Adres email',
@ -78,4 +74,5 @@ return [
'your_information' => 'Twoje dane',
'your_message' => 'Twoja wiadomość',
'your_name' => 'Twoje imię',
'your' => 'Twój',
];

View File

@ -1,13 +1,7 @@
<?php
/*************************************************************************
Generated via "php artisan localization:missing" at 2018/04/25 09:06:13
*************************************************************************/
return array (
//============================== New strings to translate ==============================//
// Defined in file C:\\wamp\\www\\attendize\\resources\\views\\Public\\LoginAndRegister\\Signup.blade.php
'already_have_account' => 'Masz już konto? <a class="semibold" href=":url">Zaloguj się!</a>',
//==================================== 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',

View File

@ -132,16 +132,21 @@
<div v-if="isScanning" class="scannerAimer">
</div>
<div v-if="scanResult" class="scannerResult @{{ scanResultType }}">
<i v-if="scanResultType == 'success'" class="ico-checkmark"></i>
<i v-if="scanResultType == 'error'" class="ico-close"></i>
<div v-if="scanResult" class="scannerResult @{{ scanResultObject.status }}">
<i v-if="scanResultObject.status == 'success'" class="ico-checkmark"></i>
<i v-if="scanResultObject.status == 'error'" class="ico-close"></i>
</div>
<div class="ScanResultMessage">
<span class="message" v-if="!isScanning">
@{{{ scanResultMessage }}}
<span class="message" v-if="scanResultObject.status == 'error'">
@{{ scanResultObject.message }}
</span>
<span v-else>
<span class="message" v-if="scanResultObject.status == 'success'">
<span class="uppercase">@lang("Attendee.name")</span>: @{{ scanResultObject.name }}<br>
<span class="uppercase">@lang("Attendee.reference")</span>: @{{scanResultObject.reference }}<br>
<span class="uppercase">@lang("Attendee.ticket")</span>: @{{scanResultObject.ticket }}
</span>
<span v-if="isScanning">
<div id="scanning-ellipsis">@lang("Attendee.scanning")<span>.</span><span>.</span><span>.</span></div>
</span>
</div>

View File

@ -6,11 +6,11 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cancel"></i>
{!! @trans("ManageEvent.cancel_attendee_title", ["cancel" => $attendee->full_name]) !!}</h3>
{{ @trans("ManageEvent.cancel_attendee_title", ["cancel" => $attendee->full_name]) }}</h3>
</div>
<div class="modal-body">
<p>
@lang("ManageEvent.cancel_description")
{{ @trans("ManageEvent.cancel_description") }}
</p>
<p>
@ -20,14 +20,14 @@
<div class="form-group">
<div class="checkbox custom-checkbox">
<input type="checkbox" name="notify_attendee" id="notify_attendee" value="1">
<label for="notify_attendee">{!! @trans("ManageEvent.cancel_notify", ["name"=>$attendee->full_name]) !!}</label>
<label for="notify_attendee">{{ @trans("ManageEvent.cancel_notify", [ "name" => $attendee->full_name]) }}</label>
</div>
</div>
@if(config('attendize.default_payment_gateway') == config('attendize.payment_gateway_stripe'))
<div class="form-group">
<div class="checkbox custom-checkbox">
<input type="checkbox" name="refund_attendee" id="refund_attendee" value="1">
<label for="refund_attendee">{!! @trans("ManageEvent.cancel_refund_user", ["name"=>$attendee->full_name]) !!}</label>
<label for="refund_attendee">{{ @trans("ManageEvent.cancel_refund_user", ["name"=>$attendee->full_name]) }}</label>
</div>
</div>
@endif

View File

@ -1,5 +1,6 @@
<div role="dialog" class="modal fade " style="display: none;">
{!! Form::open(array('url' => route('postCancelOrder', array('order_id' => $order->id)), 'class' => 'closeModalAfter ajax')) !!}
<div role="dialog" class="modal fade " style="display: none;">
{!! Form::open(array('url' => route('postCancelOrder', array('order_id' => $order->id)), 'class' => 'closeModalAfter
ajax')) !!}
<script>
$(function () {
$('input[name=refund_order]').on('change', function () {
@ -29,127 +30,129 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cart2"></i>
{!! @trans("ManageEvent.cancel_order_:ref", ["ref"=>$order->order_reference]) !!}</h3>
{{ @trans("ManageEvent.cancel_order_:ref", ["ref"=>$order->order_reference]) }}</h3>
</div>
<div class="modal-body">
@if($attendees->count())
<div class="help-block">
@lang("ManageEvent.select_attendee_to_cancel")
</div>
<div class="help-block">
@lang("ManageEvent.select_attendee_to_cancel")
</div>
<div class="well bgcolor-white p0">
<div class="well bgcolor-white p0">
<div class="table-responsive">
<table class="table table-hover ">
<tbody>
<tr>
<td style="width: 20px;">
<div class="checkbox">
<label>
{!! Form::checkbox('all_attendees', 'on', false, ['class' => 'check-all', 'data-toggle-class'=>'attendee-check']) !!}
<script>
$(function () {
$('.check-all').on ('click', function () {
$('.attendee-check').prop('checked', this.checked);
});
<div class="table-responsive">
<table class="table table-hover ">
<tbody>
<tr>
<td style="width: 20px;">
<div class="checkbox">
<label>
{!! Form::checkbox('all_attendees', 'on', false, ['class' => 'check-all',
'data-toggle-class'=>'attendee-check']) !!}
<script>
$(function () {
$('.check-all').on('click', function () {
$('.attendee-check').prop('checked', this.checked);
});
</script>
</label>
</div>
</td>
<td colspan="3">
@lang("ManageEvent.select_all")
</td>
</tr>
@foreach($attendees as $attendee)
});
</script>
</label>
</div>
</td>
<td colspan="3">
@lang("ManageEvent.select_all")
</td>
</tr>
@foreach($attendees as $attendee)
<tr class="{{$attendee->is_cancelled ? 'danger' : ''}}">
<td>
@if(!$attendee->is_cancelled)
{!!Form::checkbox('attendees[]', $attendee->id, false, ['class' => 'attendee-check'])!!}
@endif
</td>
<td>
{{$attendee->first_name}}
{{$attendee->last_name}}
</td>
<td>
{{$attendee->email}}
</td>
<td>
{{{$attendee->ticket->title}}}
{{{$order->order_reference}}}-{{{$attendee->reference_index}}}
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<tr class="{{$attendee->is_cancelled ? 'danger' : ''}}">
<td>
@if(!$attendee->is_cancelled)
{!!Form::checkbox('attendees[]', $attendee->id, false, ['class' =>
'attendee-check'])!!}
@endif
</td>
<td>
{{$attendee->first_name}}
{{$attendee->last_name}}
</td>
<td>
{{$attendee->email}}
</td>
<td>
{{{$attendee->ticket->title}}}
{{{$order->order_reference}}}-{{{$attendee->reference_index}}}
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@else
<div class="alert alert-info cancelOrderOption">
@lang("ManageEvent.all_attendees_cancelled")
</div>
<div class="alert alert-info cancelOrderOption">
@lang("ManageEvent.all_attendees_cancelled")
</div>
@endif
@if($order->transaction_id)
@if($order->payment_gateway->can_refund)
@if($order->payment_gateway->can_refund)
<div class="refund_section">
@if(!$order->is_refunded)
<div>
<div class="well bgcolor-white">
<div class="checkbox">
<label>
{!!Form::checkbox('refund_order', 'on')!!}
@lang("ManageEvent.refund_this_order?")
</label>
</div>
<div>
<div class="well bgcolor-white">
<div class="checkbox">
<label>
{!!Form::checkbox('refund_order', 'on')!!}
@lang("ManageEvent.refund_this_order?")
</label>
</div>
</div>
<div class="refund_options">
<div class="well bgcolor-white">
<div class="refund_options">
<div class="well bgcolor-white">
<div class="row">
<div class="col-md-1">
<div class="checkbox">
{!!Form::radio('refund_type', 'full', ['selected' => 'selected'])!!}
</div>
<div class="row">
<div class="col-md-1">
<div class="checkbox">
{!!Form::radio('refund_type', 'full', ['selected' => 'selected'])!!}
</div>
<div class="col-md-11">
<b>@lang("ManageEvent.issue_full_refund")</b>
</div>
<div class="col-md-11">
<b>@lang("ManageEvent.issue_full_refund")</b>
<div class="help-text">
Refund the
entire {{(money($order->organiser_amount - $order->amount_refunded, $order->event->currency))}}
</div>
<div class="help-text">
Refund the
entire {{(money($order->organiser_amount - $order->amount_refunded,
$order->event->currency))}}
</div>
</div>
</div>
</div>
<div class="well bgcolor-white clearfix">
<div class="row">
<div class="col-md-1">
<div class="checkbox">
{!!Form::radio('refund_type', 'partial')!!}
</div>
<div class="well bgcolor-white clearfix">
<div class="row">
<div class="col-md-1">
<div class="checkbox">
{!!Form::radio('refund_type', 'partial')!!}
</div>
<div class="col-md-11">
<b>@lang("ManageEvent.issue_partial_refund")</b>
</div>
<div class="col-md-11">
<b>@lang("ManageEvent.issue_partial_refund")</b>
<div class="refund_amount">
<div class="row">
<div class="col-md-4">
@lang("ManageEvent.refund_amount"):
</div>
<div class="col-sm-8">
<input type="text" name="refund_amount" class="form-control"
id="refundAmount"
placeholder="Max {{(money($order->organiser_amount - $order->amount_refunded, $order->event->currency))}}">
</div>
<div class="refund_amount">
<div class="row">
<div class="col-md-4">
@lang("ManageEvent.refund_amount"):
</div>
<div class="col-sm-8">
<input type="text" name="refund_amount" class="form-control"
id="refundAmount"
placeholder="Max {{(money($order->organiser_amount - $order->amount_refunded, $order->event->currency))}}">
</div>
</div>
</div>
@ -157,30 +160,33 @@
</div>
</div>
</div>
</div>
@else
<div class="alert alert-info">
@lang("ManageEvent.all_order_refunded", ["money"=>money($order->amount_refunded, $order->event->currency)])
</div>
<div class="alert alert-info">
@lang("ManageEvent.all_order_refunded", ["money"=>money($order->amount_refunded,
$order->event->currency)])
</div>
@endif
</div>
@else
<div class="alert alert-info">
{!! @trans("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name]) !!}
</div>
@endif
@else
<div class="alert alert-info">
{{ @trans("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name]) }}
</div>
@endif
@endif
</div>
@if($attendees->count() || !$order->is_refunded)
<div class="modal-footer">
{!! 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"]) !!}
</div>
<div class="modal-footer">
{!! 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"]) !!}
</div>
@endif
</div>
{!! Form::close() !!}

View File

@ -6,7 +6,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-edit"></i>
{!! @trans("ManageEvent.edit_attendee_title", ["attendee"=>$attendee->full_name]) !!}
{{ @trans("ManageEvent.edit_attendee_title", ["attendee"=> $attendee->full_name]) }}
</h3>
</div>
<div class="modal-body">

View File

@ -15,7 +15,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cart"></i>
{!! @trans("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference]) !!}
{{ @trans("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference]) }}
</h3>
</div>
<div class="modal-body">

View File

@ -106,4 +106,4 @@
</div><!-- /end modal content-->
</div>
{!! Form::close() !!}
</div>
</div>

View File

@ -11,7 +11,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cart"></i>
{!! @trans("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference]) !!}
{{ @trans("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference]) }}
</h3>
</div>
<div class="modal-body">

View File

@ -1,5 +1,6 @@
<div role="dialog" class="modal fade" style="display: none;">
{!! Form::open(array('url' => route('postMessageAttendee', array('attendee_id' => $attendee->id)), 'class' => 'ajax reset closeModalAfter')) !!}
<div role="dialog" class="modal fade" style="display: none;">
{!! Form::open(array('url' => route('postMessageAttendee', array('attendee_id' => $attendee->id)), 'class' => 'ajax
reset closeModalAfter')) !!}
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header text-center">
@ -13,39 +14,43 @@
<div class="row">
<div class="col-md-12">
<div class="form-group">
{!! Form::label('subject', trans("Message.subject"), array('class'=>'control-label required')) !!}
{!! Form::text('subject', Input::old('subject'),
array(
'class'=>'form-control'
)) !!}
{!! Form::label('subject', trans("Message.subject"), array('class'=>'control-label
required')) !!}
{!! Form::text('subject', Input::old('subject'),
array(
'class'=>'form-control'
)) !!}
</div>
<div class="form-group">
{!! Form::label('message', trans("Message.content"), array('class'=>'control-label required')) !!}
{!! Form::label('message', trans("Message.content"), array('class'=>'control-label
required')) !!}
{!! Form::textarea('message', Input::old('message'),
array(
'class'=>'form-control',
'rows' => '5'
)) !!}
{!! Form::textarea('message', Input::old('message'),
array(
'class'=>'form-control',
'rows' => '5'
)) !!}
</div>
<div class="form-group">
<div class="custom-checkbox">
<input type="checkbox" name="send_copy" id="send_copy" value="1">
<label for="send_copy">&nbsp;&nbsp;@lang("Message.send_a_copy_to", ["organiser"=>$attendee->event->organiser->email])</label>
<label for="send_copy">&nbsp;&nbsp;{{ @trans("Message.send_a_copy_to",
["organiser"=>$attendee->event->organiser->email]) }}</label>
</div>
</div>
</div>
</div>
<div class="help-block">
{!! @trans("Message.before_send_message", ["organiser"=>$attendee->event->organiser->email]) !!}
{{ @trans("Message.before_send_message", ["organiser"=>$attendee->event->organiser->email]) }}
</div>
</div> <!-- /end modal body-->
<div class="modal-footer">
{!! Form::button(trans("basic.cancel"), ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!}
{!! Form::submit(trans("Message.send_message"), ['class'=>"btn btn-success"]) !!}
{!! Form::button(trans("basic.cancel"), ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal'])
!!}
{!! Form::submit(trans("Message.send_message"), ['class'=>"btn btn-success"]) !!}
</div>
</div><!-- /end modal content-->
{!! Form::close() !!}

View File

@ -6,10 +6,10 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-envelope"></i>
@lang("ManageEvent.message_order", ["order"=>$order->full_name])
{{ @trans("ManageEvent.message_order", ["order"=>$order->full_name]) }}
<br>
<span style="font-size: 17px;">
@lang("ManageEvent.order_ref", ["order_ref"=>$order->reference])
{{ @trans("ManageEvent.order_ref", ["order_ref"=>$order->reference]) }}
</span>
</h3>
</div>
@ -43,7 +43,7 @@
</div>
<div class="help-block">
{!! @trans("ManageEvent.order_contact_will_receive_instructions", ["email"=>$order->event->organiser->email]) !!}
{{ @trans("ManageEvent.order_contact_will_receive_instructions", ["email"=>$order->event->organiser->email]) }}
</div>
</div> <!-- /end modal body-->

View File

@ -6,12 +6,12 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-envelope"></i>
@lang("ManageEvent.resend_ticket_to_attendee", ["attendee"=>$attendee->full_name])
{{ @trans("ManageEvent.resend_ticket_to_attendee", ["attendee" => $attendee->full_name]) }}
</h3>
</div>
<div class="modal-body">
<div class="help-block">
{!! @trans("ManageEvent.resend_ticket_help", ["email"=>$attendee->email]) !!}
{{ @trans("ManageEvent.resend_ticket_help", ["email" => $attendee->email]) }}
</div>
</div> <!-- /end modal body-->
<div class="modal-footer">

View File

@ -18,7 +18,7 @@
<i class='ico-cart mr5'></i>
@lang("Event.event_orders")
<span class="page_title_sub_title hide">
{!! @trans("Event.showing_num_of_orders", [30, \App\Models\Order::scope()->count()]) !!}
{{ @trans("Event.showing_num_of_orders", [30, \App\Models\Order::scope()->count()]) }}
</span>
@stop

View File

@ -6,7 +6,8 @@
}
</style>
<div class="alert alert-warning top_of_page_alert">
{!! @trans("ManageEvent.event_not_live_with_activate", ["url"=>route('MakeEventLive', ['event_id' => $event->id])]) !!} .
{{ @trans("ManageEvent.event_not_live") }}
<a href="{{ route('MakeEventLive', ['event_id' => $event->id]) }}">{{ @trans("ManageEvent.publish_it") }}</a>
</div>
@endif
@stop

View File

@ -19,7 +19,7 @@
</head>
<body style="background-color: #FFFFFF;" onload="window.print();">
<div class="well" style="border:none; margin: 0;">
{!! @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()]) }}
<br>
</div>

View File

@ -119,9 +119,10 @@
<p class="list-group-text">
<a href="{{ route('showEventOrders', ['event_id' => $order->event_id, 'q' => $order->order_reference]) }}">
<b>#{{ $order->order_reference }}</b></a> -
{!! @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()]) !!}
<a href="{{ route('showEventAttendees', ['event_id'=>$order->event->id,'q'=>$order->order_reference]) }}">
<strong>{{ $order->full_name }}</strong>
</a> {{ @trans("Order.registered") }}
{{ $order->attendees()->withTrashed()->count() }} {{ @trans("Order.tickets") }}
</p>
<h6>
{{ $order->created_at->diffForHumans() }} &bull; <span

View File

@ -1,9 +1,13 @@
@if(!$event->is_live)
<section id="goLiveBar">
<div class="container">
@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") }}
<a href="{{ route('MakeEventLive' , ['event_id' => $event->id]) }}"
style="background-color: green; border-color: green;"
class="btn btn-success btn-xs">{{ @trans("ManageEvent.publish_it") }}</a>
@endif
</div>
</section>
@endif

View File

@ -53,9 +53,12 @@
<span class="massive-icon">
<i class="ico ico-checkmark-circle"></i>
</span>
<h1>{!! @trans("Public_ViewEvent.thank_you_for_your_order") !!}</h1>
<h1>{{ @trans("Public_ViewEvent.thank_you_for_your_order") }}</h1>
<h2>
{!! @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") }}
<a class="ticket_download_link"
href="{{ route('showOrderTickets', ['order_reference' => $order->order_reference] ).'?download=1' }}">
{{ @trans("Public_ViewEvent.tickets") }}</a> {{ @trans("Public_ViewEvent.confirmation_email") }}
</h2>
</div>
</div>

2
self-signed.conf Normal file
View File

@ -0,0 +1,2 @@
ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;

21
ssl-params.conf Normal file
View File

@ -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;