diff --git a/Assets/js/components/DateRangePicker.vue b/Assets/js/components/DateRangePicker.vue index 9fe6417..99227d7 100644 --- a/Assets/js/components/DateRangePicker.vue +++ b/Assets/js/components/DateRangePicker.vue @@ -84,4 +84,7 @@ .demonstration{ font-weight: bold; } + .el-input__inner{ + height: 34px; + } \ No newline at end of file diff --git a/Channels/SMSChannel.php b/Channels/SMSChannel.php index 37a0ad4..b5a5265 100644 --- a/Channels/SMSChannel.php +++ b/Channels/SMSChannel.php @@ -25,26 +25,26 @@ public function send($notifiable, Notification $notification) \Log::debug($api_url); // Get cURL resource - // $curl = curl_init(); - - // curl_setopt_array($curl, array( - // CURLOPT_PORT => "80", - // CURLOPT_URL => trim($api_url), - // CURLOPT_RETURNTRANSFER => true, - // CURLOPT_ENCODING => "", - // CURLOPT_MAXREDIRS => 10, - // CURLOPT_TIMEOUT => 30, - // CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, - // CURLOPT_CUSTOMREQUEST => "GET", - // CURLOPT_HTTPHEADER => array( - // "Cache-Control: no-cache", - // ), - // )); - - // $response = curl_exec($curl); - // $err = curl_error($curl); - - // curl_close($curl); + $curl = curl_init(); + + curl_setopt_array($curl, array( + CURLOPT_PORT => "80", + CURLOPT_URL => trim($api_url), + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => "", + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 30, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => "GET", + CURLOPT_HTTPHEADER => array( + "Cache-Control: no-cache", + ), + )); + + $response = curl_exec($curl); + $err = curl_error($curl); + + curl_close($curl); $response = file_get_contents($api_url); diff --git a/Resources/views/partials/form/date_group.blade.php b/Resources/views/partials/form/date_group.blade.php index 05c328d..a2fc904 100644 --- a/Resources/views/partials/form/date_group.blade.php +++ b/Resources/views/partials/form/date_group.blade.php @@ -2,7 +2,7 @@ @stack($name . '_input_start') -
+
{!! Form::label($name, $text, ['class' => 'control-label']) !!}
diff --git a/Resources/views/partials/form/number_group.blade.php b/Resources/views/partials/form/number_group.blade.php index 1ee5406..944e3a8 100644 --- a/Resources/views/partials/form/number_group.blade.php +++ b/Resources/views/partials/form/number_group.blade.php @@ -1,6 +1,6 @@ @stack($name . '_input_start') -
+
{!! Form::label($name, $text, ['class' => 'control-label']) !!}
diff --git a/Resources/views/partials/form/text_group.blade.php b/Resources/views/partials/form/text_group.blade.php index fef0831..0fb4640 100644 --- a/Resources/views/partials/form/text_group.blade.php +++ b/Resources/views/partials/form/text_group.blade.php @@ -6,7 +6,7 @@ * @endif -
+
@if($icon != '')
@endif diff --git a/includes/macros.php b/includes/macros.php index 0e6ea2e..2e46d83 100644 --- a/includes/macros.php +++ b/includes/macros.php @@ -23,7 +23,7 @@ ]); Form::component('dateGroup', 'rarv::partials.form.date_group', [ - 'name', 'text', 'icon', 'attributes' => ['type' => 'date', 'future' => true], 'value' => null, 'col' => 'col-md-6', + 'name', 'text', 'icon', 'attributes' => ['type' => 'date', 'future' => true], 'value' => null, 'col' => 'col-md-4', ]); /**