Skip to content

Develop #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbaliya26 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Develop #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d545e2d
update field changes
mbaliya26 Jul 28, 2020
7c10521
change height of datepicker
mbaliya26 Jul 28, 2020
d1d4a61
uncomment sms code
mbaliya26 Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Assets/js/components/DateRangePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,7 @@
.demonstration{
font-weight: bold;
}
.el-input__inner{
height: 34px;
}
</style>
40 changes: 20 additions & 20 deletions Channels/SMSChannel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion Resources/views/partials/form/date_group.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@stack($name . '_input_start')

<div class="form-group {{ $col }} {{ isset($attributes['required']) ? 'required' : '' }} {{ $errors->has($name) ? 'has-error' : '' }}">
<div class="{{ isset($attributes['required']) ? 'required' : '' }} {{ $errors->has($name) ? 'has-error' : '' }}">
{!! Form::label($name, $text, ['class' => 'control-label']) !!}

<div class="{{ $icon == '' ? '' : 'input-group' }}">
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/partials/form/number_group.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@stack($name . '_input_start')

<div class="form-group {{ $col }} {{ isset($attributes['required']) ? 'required' : '' }} {{ $errors->has($name) ? 'has-error' : '' }}">
<div class="{{ isset($attributes['required']) ? 'required' : '' }} {{ $errors->has($name) ? 'has-error' : '' }}">
{!! Form::label($name, $text, ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-{{ $icon }}"></i></div>
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/partials/form/text_group.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="text-danger">*</span>
@endif

<div class="{{ $icon == '' ? 'form-group' : 'input-group' }}">
<div class="input-group">
@if($icon != '')
<div class="input-group-addon"><i class="fa fa-{{ $icon }}"></i></div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion includes/macros.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);

/**
Expand Down