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") }}