From 2ebc6800e63542f148010a210ba688b722a776d3 Mon Sep 17 00:00:00 2001 From: Dave Earley Date: Thu, 7 Jul 2016 15:50:39 +0100 Subject: [PATCH] Added ability to enable 1D barcode on tickets (closes #18) --- .../Controllers/EventCustomizeController.php | 40 ++++++++++--------- ..._add_1d_barcode_option_to_events_table.php | 31 ++++++++++++++ public/assets/stylesheet/ticket.css | 18 +++++---- .../views/ManageEvent/Customize.blade.php | 6 +++ .../Partials/TicketDesignPreview.blade.php | 5 +++ .../ViewEvent/Partials/PDFTicket.blade.php | 4 +- 6 files changed, 77 insertions(+), 27 deletions(-) create mode 100644 database/migrations/2016_07_07_143106_add_1d_barcode_option_to_events_table.php diff --git a/app/Http/Controllers/EventCustomizeController.php b/app/Http/Controllers/EventCustomizeController.php index 9d213706..6c30e066 100644 --- a/app/Http/Controllers/EventCustomizeController.php +++ b/app/Http/Controllers/EventCustomizeController.php @@ -20,9 +20,9 @@ class EventCustomizeController extends MyBaseController public function showCustomize($event_id = '', $tab = '') { $data = $this->getEventViewData($event_id, [ - 'available_bg_images' => $this->getAvailableBackgroundImages(), + 'available_bg_images' => $this->getAvailableBackgroundImages(), 'available_bg_images_thumbs' => $this->getAvailableBackgroundImagesThumbs(), - 'tab' => $tab, + 'tab' => $tab, ]); return view('ManageEvent.Customize', $data); @@ -92,22 +92,22 @@ class EventCustomizeController extends MyBaseController if ($validator->fails()) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validator->messages()->toArray(), ]); } - $event->social_share_text = $request->get('social_share_text'); - $event->social_show_facebook = $request->get('social_show_facebook'); - $event->social_show_linkedin = $request->get('social_show_linkedin'); - $event->social_show_twitter = $request->get('social_show_twitter'); - $event->social_show_email = $request->get('social_show_email'); + $event->social_share_text = $request->get('social_share_text'); + $event->social_show_facebook = $request->get('social_show_facebook'); + $event->social_show_linkedin = $request->get('social_show_linkedin'); + $event->social_show_twitter = $request->get('social_show_twitter'); + $event->social_show_email = $request->get('social_show_email'); $event->social_show_googleplus = $request->get('social_show_googleplus'); - $event->social_show_whatsapp = $request->get('social_show_whatsapp'); + $event->social_show_whatsapp = $request->get('social_show_whatsapp'); $event->save(); return response()->json([ - 'status' => 'success', + 'status' => 'success', 'message' => 'Social Settings Successfully Updated', ]); @@ -129,6 +129,7 @@ class EventCustomizeController extends MyBaseController 'ticket_bg_color' => ['required'], 'ticket_text_color' => ['required'], 'ticket_sub_text_color' => ['required'], + 'is_1d_barcode_enabled' => ['required'], ]; $messages = [ 'ticket_bg_color.required' => 'Please enter a background color.', @@ -138,7 +139,7 @@ class EventCustomizeController extends MyBaseController if ($validator->fails()) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validator->messages()->toArray(), ]); } @@ -147,11 +148,12 @@ class EventCustomizeController extends MyBaseController $event->ticket_bg_color = $request->get('ticket_bg_color'); $event->ticket_text_color = $request->get('ticket_text_color'); $event->ticket_sub_text_color = $request->get('ticket_sub_text_color'); + $event->is_1d_barcode_enabled = $request->get('is_1d_barcode_enabled'); $event->save(); return response()->json([ - 'status' => 'success', + 'status' => 'success', 'message' => 'Ticket Settings Updated', ]); } @@ -181,7 +183,7 @@ class EventCustomizeController extends MyBaseController if ($validator->fails()) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validator->messages()->toArray(), ]); } @@ -191,7 +193,7 @@ class EventCustomizeController extends MyBaseController $event->save(); return response()->json([ - 'status' => 'success', + 'status' => 'success', 'message' => 'Order Page Successfully Updated', ]); } @@ -215,17 +217,17 @@ class EventCustomizeController extends MyBaseController if ($validator->fails()) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validator->messages()->toArray(), ]); } - $event->pre_order_display_message = trim($request->get('pre_order_display_message')); + $event->pre_order_display_message = trim($request->get('pre_order_display_message')); $event->post_order_display_message = trim($request->get('post_order_display_message')); $event->save(); return response()->json([ - 'status' => 'success', + 'status' => 'success', 'message' => 'Order Page Successfully Updated', ]); } @@ -253,7 +255,7 @@ class EventCustomizeController extends MyBaseController if ($validator->fails()) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validator->messages()->toArray(), ]); } @@ -297,7 +299,7 @@ class EventCustomizeController extends MyBaseController $event->save(); return response()->json([ - 'status' => 'success', + 'status' => 'success', 'message' => 'Event Page Successfully Updated', 'runThis' => 'document.getElementById(\'previewIframe\').contentWindow.location.reload(true);', ]); diff --git a/database/migrations/2016_07_07_143106_add_1d_barcode_option_to_events_table.php b/database/migrations/2016_07_07_143106_add_1d_barcode_option_to_events_table.php new file mode 100644 index 00000000..b40a4f37 --- /dev/null +++ b/database/migrations/2016_07_07_143106_add_1d_barcode_option_to_events_table.php @@ -0,0 +1,31 @@ +boolean('is_1d_barcode_enabled')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('events', function (Blueprint $table) { + $table->dropColumn('is_1d_barcode_enabled'); + }); + } +} diff --git a/public/assets/stylesheet/ticket.css b/public/assets/stylesheet/ticket.css index 9204488c..fd3710b6 100644 --- a/public/assets/stylesheet/ticket.css +++ b/public/assets/stylesheet/ticket.css @@ -43,14 +43,18 @@ background-color: #fdfdfd; } -.ticket .barcode_vertical { +.ticket .barcode_vertical { + display: block; + -moz-transform: rotate(-90deg); + -ms-transform: rotate(-90deg); + -o-transform: rotate(-90deg); + -webkit-transform: rotate(-90deg); position: absolute; - right: 100px; - top: 171px; - width: 300px; -} -.ticket .barcode_vertical svg { - width:300px; + right: -38px; + bottom: 79px; + width: 192px; + height: 50px; + background: #fff; } .ticket .top_barcode { diff --git a/resources/views/ManageEvent/Customize.blade.php b/resources/views/ManageEvent/Customize.blade.php index 1745c23e..ac7ad880 100644 --- a/resources/views/ManageEvent/Customize.blade.php +++ b/resources/views/ManageEvent/Customize.blade.php @@ -551,6 +551,12 @@ ]) !!} +
+
+ {!! Form::label('is_1d_barcode_enabled', 'Show 1D barcode on tickets', ['class' => 'control-label required']) !!} + {!! Form::select('is_1d_barcode_enabled', [1 => 'Yes', 0 => 'No'], $event->is_1d_barcode_enabled, ['class'=>'form-control']) !!} +
+
diff --git a/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php b/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php index 737c0fda..b82adbfe 100644 --- a/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php +++ b/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php @@ -39,4 +39,9 @@
{!! DNS2D::getBarcodeSVG('hello', "QRCODE", 6, 6) !!}
+ @if($event->is_1d_barcode_enabled) +
+ {!! DNS1D::getBarcodeSVG(12211221, "C39+", 1, 50) !!} +
+ @endif
diff --git a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php index 2761d600..d8d672b1 100644 --- a/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php +++ b/resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php @@ -91,9 +91,11 @@
{!! DNS2D::getBarcodeSVG($attendee->private_reference_number, "QRCODE", 6, 6) !!}
+ @if($event->is_1d_barcode_enabled)
- {{-- DNS1D::getBarcodeSVG($attendee->private_reference_number, "C39+", 1, 50) !!}
{{$attendee->private_reference_number --}} + {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "C39+", 1, 50) !!}
+ @endif @endif @endforeach