From 4de92bdbee8f450bacbb2699e78d9843c373fc96 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 26 Feb 2020 16:15:02 +0500 Subject: [PATCH] booking fee and instagram --- app/Models/Event.php | 4 ++-- app/Models/Ticket.php | 2 +- .../vendor/backpack/da_DK/pagemanager.php | 22 +++++++++++++++++++ .../lang/vendor/backpack/de/pagemanager.php | 22 +++++++++++++++++++ .../lang/vendor/backpack/fr/pagemanager.php | 22 +++++++++++++++++++ .../lang/vendor/backpack/it/pagemanager.php | 22 +++++++++++++++++++ .../lang/vendor/backpack/nl/pagemanager.php | 22 +++++++++++++++++++ .../lang/vendor/backpack/pt/pagemanager.php | 22 +++++++++++++++++++ 8 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 resources/lang/vendor/backpack/da_DK/pagemanager.php create mode 100644 resources/lang/vendor/backpack/de/pagemanager.php create mode 100644 resources/lang/vendor/backpack/fr/pagemanager.php create mode 100644 resources/lang/vendor/backpack/it/pagemanager.php create mode 100644 resources/lang/vendor/backpack/nl/pagemanager.php create mode 100644 resources/lang/vendor/backpack/pt/pagemanager.php diff --git a/app/Models/Event.php b/app/Models/Event.php index 04acc5ad..b2d68051 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -244,7 +244,7 @@ class Event extends MyBaseModel */ public function getFixedFeeAttribute() { - return config('attendize.ticket_booking_fee_fixed') + $this->organiser_fee_fixed; + return config('settings.booking_fee_fixed') + $this->organiser_fee_fixed; } /** @@ -254,7 +254,7 @@ class Event extends MyBaseModel */ public function getPercentageFeeAttribute() { - return config('attendize.ticket_booking_fee_percentage') + $this->organiser_fee_percentage; + return config('settings.booking_fee_percentage') + $this->organiser_fee_percentage; } /** diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index 74ec1c4e..50deed87 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -202,7 +202,7 @@ class Ticket extends MyBaseModel public function getBookingFeeAttribute() { return (int)ceil($this->price) === 0 ? 0 : round( - ($this->price * (config('attendize.ticket_booking_fee_percentage') / 100)) + (config('attendize.ticket_booking_fee_fixed')), + ($this->price * (config('settings.booking_fee_percentage') / 100)) + (config('settings.booking_fee_fixed')), 2 ); } diff --git a/resources/lang/vendor/backpack/da_DK/pagemanager.php b/resources/lang/vendor/backpack/da_DK/pagemanager.php new file mode 100644 index 00000000..09425477 --- /dev/null +++ b/resources/lang/vendor/backpack/da_DK/pagemanager.php @@ -0,0 +1,22 @@ + 'Er du sikker på at du vil ændre side skabelonen? Du mister ugemte ændringer for denne side.', + 'content' => 'Indhold', + 'content_placeholder' => 'dit Indhold indsættes her', + 'meta_description' => 'Meta beskrivelse', + 'meta_keywords' => 'Meta søgeord', + 'meta_title' => 'Meta titel', + 'metas' => 'Metaer', + 'name' => 'Navn', + 'open' => 'åben', + 'page' => 'side', + 'page_name' => 'Side navn (kan kun ses af administratorer)', + 'page_slug' => 'Page Slug (Link)', + 'page_slug_hint' => 'Vil automatisk blive genereret fra titlen, hvis denne efterlades blank.', + 'page_title' => 'Side Titel', + 'pages' => 'Sider', + 'slug' => 'Slug', + 'template' => 'Skabelon', + 'template_not_found' => 'Skabelonen kunne ikke findes. Den kan være blevet slettet siden denne side blev oprettet. For at forsætte så bed din web administrator, eller udviklingsteam om at løse dette.', +]; diff --git a/resources/lang/vendor/backpack/de/pagemanager.php b/resources/lang/vendor/backpack/de/pagemanager.php new file mode 100644 index 00000000..58fb98ed --- /dev/null +++ b/resources/lang/vendor/backpack/de/pagemanager.php @@ -0,0 +1,22 @@ + 'Willst Du die Vorlage wirklich ändern? Alle ungespeicherten Änderungen gehen dardurch verloren.', + 'content' => 'Inhalt', + 'content_placeholder' => 'Inhalt eingeben', + 'meta_description' => 'Meta Beschreibung', + 'meta_keywords' => 'Meta Schlüsselwörter', + 'meta_title' => 'Meta Titel', + 'metas' => 'Metas', + 'name' => 'Name', + 'open' => 'Öffnen', + 'page' => 'Seite', + 'page_name' => 'Seitenname (nur für Admins sichtbar)', + 'page_slug' => 'Seiten-Slug (URL)', + 'page_slug_hint' => 'Wird automatisch generiert, falls leer.', + 'page_title' => 'Seitentitel', + 'pages' => 'Seiten', + 'slug' => 'Slug', + 'template' => 'Vorlage', + 'template_not_found' => 'Die Vorlage wurde nicht gefunden. Möglicheweise wurde sie nach Erstellen der Seite gelöscht. Bitte frage Deine Entwickler um Hilfe.', +]; diff --git a/resources/lang/vendor/backpack/fr/pagemanager.php b/resources/lang/vendor/backpack/fr/pagemanager.php new file mode 100644 index 00000000..119f76af --- /dev/null +++ b/resources/lang/vendor/backpack/fr/pagemanager.php @@ -0,0 +1,22 @@ + 'Confirmez-vous le changement de modèle? Toutes les modifications non enregistrées pour cette page seront perdues.', + 'content' => 'Contenu', + 'content_placeholder' => 'Saisissez le contenu de la page ici', + 'meta_description' => 'Méta description', + 'meta_keywords' => 'Méta mots-clés', + 'meta_title' => 'Méta titre', + 'metas' => 'Balises META', + 'name' => 'Nom', + 'open' => 'Ouvrir', + 'page' => 'page', + 'page_name' => 'Nom de page (visible uniquement par les admins)', + 'page_slug' => 'Url simplifiée', + 'page_slug_hint' => 'Sera générée automatiquement à partir du titre si laissée vide.', + 'page_title' => 'Titre de la page', + 'pages' => 'pages', + 'slug' => 'Url simplifiée', + 'template' => 'Modèle', + 'template_not_found' => 'Le modèle de page n’a pu être trouvé. Il a dû être supprimé ou renommé depuis la création de cette page. Pour poursuivre, veuillez demander l’intervention de votre webmaster ou développeur.', +]; diff --git a/resources/lang/vendor/backpack/it/pagemanager.php b/resources/lang/vendor/backpack/it/pagemanager.php new file mode 100644 index 00000000..530e6c09 --- /dev/null +++ b/resources/lang/vendor/backpack/it/pagemanager.php @@ -0,0 +1,22 @@ + 'Sei sicuro di voler cambiare il template della pagina? Perderai qualsiasi modifiche non salvata per questa pagina.', + 'content' => 'Contenuto', + 'content_placeholder' => 'Il tuo contenuto qui', + 'meta_description' => 'Meta Description', + 'meta_keywords' => 'Meta Keywords', + 'meta_title' => 'Meta Title', + 'metas' => 'Meta', + 'name' => 'Nome', + 'open' => 'Apri', + 'page' => 'pagina', + 'page_name' => 'Nome pagina (visibile solo agli amministratori)', + 'page_slug' => 'Slug pagina (URL)', + 'page_slug_hint' => 'Se lasciato in bianco, verrà automaticamente generato dal titolo.', + 'page_title' => 'Titolo pagina', + 'pages' => 'pagine', + 'slug' => 'Slug', + 'template' => 'Template', + 'template_not_found' => 'Il template non è stato trovato. Potrebbe essere stato eliminato da quando la pagina è stata creata. Per continuare, chiedi al tuo amministratore o al team di sviluppo di risolvere questo problema.', +]; diff --git a/resources/lang/vendor/backpack/nl/pagemanager.php b/resources/lang/vendor/backpack/nl/pagemanager.php new file mode 100644 index 00000000..d76ad768 --- /dev/null +++ b/resources/lang/vendor/backpack/nl/pagemanager.php @@ -0,0 +1,22 @@ + 'Weet je zeker dat je de pagina template wilt aanpassen? Als er nog niet op opslaan is geklikt wordt alle op deze pagina ingevoerde data verwijderd.', + 'content' => 'Content', + 'content_placeholder' => 'Je content hier', + 'meta_description' => 'Meta Description', + 'meta_keywords' => 'Meta Keywords', + 'meta_title' => 'Meta Title', + 'metas' => 'Meta informatie', + 'name' => 'Naam', + 'open' => 'Open', + 'page' => 'pagina', + 'page_name' => 'Pagina naam (alleen zichtbaar in admin)', + 'page_slug' => 'Vriendelijke URL naam', + 'page_slug_hint' => 'Deze wordt bij leeg laten automatisch gegeneeerd.', + 'page_title' => 'Pagina titel', + 'pages' => 'pagina\'s', + 'slug' => 'Slug', + 'template' => 'Template', + 'template_not_found' => 'De template is niet gevonden. Misschien is deze verwijderd nadat deze pagina is aangemaakt. Neem contact op met de web ontwikkelaar', +]; diff --git a/resources/lang/vendor/backpack/pt/pagemanager.php b/resources/lang/vendor/backpack/pt/pagemanager.php new file mode 100644 index 00000000..349af9bc --- /dev/null +++ b/resources/lang/vendor/backpack/pt/pagemanager.php @@ -0,0 +1,22 @@ + 'Tem a certeza que quer mudar o modelo da página? Vai perder as alterações que não tenham sido guardadas.', + 'content' => 'Conteúdo', + 'content_placeholder' => 'O seu conteúdo aqui', + 'meta_description' => 'Descrição (meta)', + 'meta_keywords' => 'Palavras-chave (meta)', + 'meta_title' => 'Título (meta)', + 'metas' => 'Metas', + 'name' => 'Nome', + 'open' => 'Abrir', + 'page' => 'página', + 'page_name' => 'Nome da página (visível apenas a administradores)', + 'page_slug' => 'Slug da página (URL)', + 'page_slug_hint' => 'Se não for preenchido, será gerado automaticamente a partir do título.', + 'page_title' => 'Título da página', + 'pages' => 'páginas', + 'slug' => 'Slug', + 'template' => 'Modelo', + 'template_not_found' => 'O modelo não foi encontrado. Pode ter sido apagado depois desta página ter sido criada. Para continuar, por favor peça ao seu administrador ou equipa de desenvolvimento para corrigir este problema.', +];