Merge pull request #57 from diverds1992/master

Button and Label css fix
ryanmitchell · Jun 5, 2022 · 3f39d3b · 3f39d3b
2 parents d952484 + 13f0fc8
commit 3f39d3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controllers/Summary.php b/controllers/Summary.php
@@ -261,9 +261,9 @@ public function view($route, $viewId)
 							'status_name' => $order->status_name,
 							'status_color' => $order->status_color,
 							'buttons' => '
-			                	'.($viewSettings->display['button1_enable'] ? '<a class="btn label-default'.($order->status_id != $viewSettings->display['button1_status'] ? '" href="'.$buttonUrl.$viewSettings->display['button1_status'].'" style="background-color:'.$viewSettings->display['button1_color'].'";' : ' btn-light"').'>'.$viewSettings->display['button1_text'].'</a>' : '').'
-								'.($viewSettings->display['button2_enable'] ? '<a class="btn label-default'.($order->status_id != $viewSettings->display['button2_status'] ? '" href="'.$buttonUrl.$viewSettings->display['button2_status'].'" style="background-color:'.$viewSettings->display['button2_color'].'";' : ' btn-light"').'>'.$viewSettings->display['button2_text'].'</a>' : '').'
-								'.($viewSettings->display['button3_enable'] ? '<a class="btn label-default'.($order->status_id != $viewSettings->display['button3_status'] ? '" href="'.$buttonUrl.$viewSettings->display['button3_status'].'" style="background-color:'.$viewSettings->display['button3_color'].'";' : ' btn-light"').'>'.$viewSettings->display['button3_text'].'</a>' : '').'
+			                	'.($viewSettings->display['button1_enable'] ? '<a class="btn label-default'.($order->status_id != $viewSettings->display['button1_status'] ? '" href="'.$buttonUrl.$viewSettings->display['button1_status'].'" style="background-color:'.$viewSettings->display['button1_color'].'!important";' : ' btn-light"').'>'.$viewSettings->display['button1_text'].'</a>' : '').'
+								'.($viewSettings->display['button2_enable'] ? '<a class="btn label-default'.($order->status_id != $viewSettings->display['button2_status'] ? '" href="'.$buttonUrl.$viewSettings->display['button2_status'].'" style="background-color:'.$viewSettings->display['button2_color'].'!important";' : ' btn-light"').'>'.$viewSettings->display['button2_text'].'</a>' : '').'
+								'.($viewSettings->display['button3_enable'] ? '<a class="btn label-default'.($order->status_id != $viewSettings->display['button3_status'] ? '" href="'.$buttonUrl.$viewSettings->display['button3_status'].'" style="background-color:'.$viewSettings->display['button3_color'].'!important";' : ' btn-light"').'>'.$viewSettings->display['button3_text'].'</a>' : '').'
 							',
 							'assign' => $viewSettings->display['assign'] ? Staffs_model::getDropdownOptions() : '',
 							'assign_url' => $assignUrl,

diff --git a/views/summary/view.blade.php b/views/summary/view.blade.php
@@ -52,7 +52,7 @@
 						@endswitch
 
 						@if($viewSettings->display['card_status'])
-							<h6 class="label label-default mt-2" style="background-color:{!! $order->status_color !!}">{{ $order->status_name }}</h6>
+							<h6 class="label label-default mt-2" style="background-color:{!! $order->status_color !!}!important">{{ $order->status_name }}</h6>
 						@endif
 
 						@if($viewSettings->display['card_items'])