From 8ea420b2bcc03c2ff1a7941895cf4ecf7ce6c210 Mon Sep 17 00:00:00 2001 From: James Dahlen Date: Tue, 12 Mar 2019 09:37:43 -0400 Subject: [PATCH 1/3] manage event currency --- app/Http/Controllers/EventController.php | 1 + app/Http/Controllers/EventCustomizeController.php | 2 ++ resources/lang/en/ManageEvent.php | 1 + resources/views/ManageEvent/Partials/EditEventForm.blade.php | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 85eca3af..ef783272 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -220,6 +220,7 @@ class EventController extends MyBaseController } $event->is_live = $request->get('is_live'); + $event->currency_id = $request->get('currency_id'); $event->title = $request->get('title'); $event->description = strip_tags($request->get('description')); $event->start_date = $request->get('start_date'); diff --git a/app/Http/Controllers/EventCustomizeController.php b/app/Http/Controllers/EventCustomizeController.php index 252924ae..2329db75 100644 --- a/app/Http/Controllers/EventCustomizeController.php +++ b/app/Http/Controllers/EventCustomizeController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Models\Event; use File; use Illuminate\Http\Request; +use App\Models\Currency; use Image; use Validator; @@ -20,6 +21,7 @@ class EventCustomizeController extends MyBaseController public function showCustomize($event_id = '', $tab = '') { $data = $this->getEventViewData($event_id, [ + 'currencies' => Currency::pluck('title', 'id'), 'available_bg_images' => $this->getAvailableBackgroundImages(), 'available_bg_images_thumbs' => $this->getAvailableBackgroundImagesThumbs(), 'tab' => $tab, diff --git a/resources/lang/en/ManageEvent.php b/resources/lang/en/ManageEvent.php index 1ccae0a0..7c82cd21 100644 --- a/resources/lang/en/ManageEvent.php +++ b/resources/lang/en/ManageEvent.php @@ -23,6 +23,7 @@ return array ( 'confirm_order_cancel' => 'Confirm Order Cancel', 'create_attendees' => 'Create Attendees', 'create_ticket' => 'Create Ticket', + 'default_currency' => 'Default currency', 'download_pdf_ticket' => 'Download PDF Ticket', 'edit_attendee' => 'Edit Attendee', 'edit_attendee_title' => 'Edit :attendee', diff --git a/resources/views/ManageEvent/Partials/EditEventForm.blade.php b/resources/views/ManageEvent/Partials/EditEventForm.blade.php index 2d74364a..0edad147 100644 --- a/resources/views/ManageEvent/Partials/EditEventForm.blade.php +++ b/resources/views/ManageEvent/Partials/EditEventForm.blade.php @@ -4,6 +4,10 @@
+
+ {!! Form::label('currency_id', trans("ManageEvent.default_currency"), array('class'=>'control-label required')) !!} + {!! Form::select('currency_id', $currencies, $event->currency_id, ['class' => 'form-control']) !!} +
{!! Form::label('is_live', trans("Event.event_visibility"), array('class'=>'control-label required')) !!} {!! Form::select('is_live', [ From f5588f1818c9f6aeb6ea95b84d2e2039f5bb111a Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Fri, 22 Mar 2019 15:55:33 +0200 Subject: [PATCH 2/3] fixed spacking --- app/Http/Controllers/EventCustomizeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/EventCustomizeController.php b/app/Http/Controllers/EventCustomizeController.php index 2329db75..31ef5b1f 100644 --- a/app/Http/Controllers/EventCustomizeController.php +++ b/app/Http/Controllers/EventCustomizeController.php @@ -21,7 +21,7 @@ class EventCustomizeController extends MyBaseController public function showCustomize($event_id = '', $tab = '') { $data = $this->getEventViewData($event_id, [ - 'currencies' => Currency::pluck('title', 'id'), + 'currencies' => Currency::pluck('title', 'id'), 'available_bg_images' => $this->getAvailableBackgroundImages(), 'available_bg_images_thumbs' => $this->getAvailableBackgroundImagesThumbs(), 'tab' => $tab, From bb6f0daf04901006bba030f8f639d329352041e3 Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Fri, 22 Mar 2019 15:58:14 +0200 Subject: [PATCH 3/3] as events can be in different currencies remove the sum of all events from the dashboard --- .../views/ManageOrganiser/Dashboard.blade.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/resources/views/ManageOrganiser/Dashboard.blade.php b/resources/views/ManageOrganiser/Dashboard.blade.php index 8b71aa02..2f4d5ec7 100644 --- a/resources/views/ManageOrganiser/Dashboard.blade.php +++ b/resources/views/ManageOrganiser/Dashboard.blade.php @@ -52,7 +52,7 @@ @section('content')
-
+

{{$organiser->events->count()}} @@ -62,7 +62,7 @@

-
+

{{$organiser->attendees->count()}} @@ -72,16 +72,6 @@

-
-
-

- {{ money($organiser->events->sum('sales_volume') + $organiser->events->sum('organiser_fees_volume'), $organiser->account->currency) }} -

- - @lang("Organiser.sales_volume") - -
-