1) {
- $offset = intval($addArray[1]);
- } elseif (count($minArray) > 1) {
- $offset = intval($minArray[1]) * -1;
- }
-
- $val = Utils::getDatePart($variable, $offset);
- $str = str_replace($match, $val, $str);
- }
- }
-
- return $str;
- }
-
- private static function getDatePart($part, $offset)
- {
- $offset = intval($offset);
- if ($part == 'MONTH') {
- return Utils::getMonth($offset);
- } elseif ($part == 'QUARTER') {
- return Utils::getQuarter($offset);
- } elseif ($part == 'YEAR') {
- return Utils::getYear($offset);
- }
- }
-
- private static function getMonth($offset)
- {
- $months = [ "January", "February", "March", "April", "May", "June",
- "July", "August", "September", "October", "November", "December", ];
-
- $month = intval(date('n')) - 1;
-
- $month += $offset;
- $month = $month % 12;
-
- if ($month < 0) {
- $month += 12;
- }
-
- return $months[$month];
- }
-
- private static function getQuarter($offset)
- {
- $month = intval(date('n')) - 1;
- $quarter = floor(($month + 3) / 3);
- $quarter += $offset;
- $quarter = $quarter % 4;
- if ($quarter == 0) {
- $quarter = 4;
- }
-
- return 'Q'.$quarter;
- }
-
- private static function getYear($offset)
- {
- $year = intval(date('Y'));
-
- return $year + $offset;
- }
-
- public static function getEntityName($entityType)
- {
- return ucwords(str_replace('_', ' ', $entityType));
- }
-
- public static function getClientDisplayName($model)
- {
- if ($model->client_name) {
- return $model->client_name;
- } elseif ($model->first_name || $model->last_name) {
- return $model->first_name.' '.$model->last_name;
- } else {
- return $model->email;
- }
- }
-
- public static function encodeActivity($person = null, $action, $entity = null, $otherPerson = null)
- {
- $person = $person ? $person->getDisplayName() : 'System';
- $entity = $entity ? '['.$entity->getActivityKey().']' : '';
- $otherPerson = $otherPerson ? 'to '.$otherPerson->getDisplayName() : '';
- $token = Session::get('token_id') ? ' ('.trans('texts.token').')' : '';
-
- return trim("$person $token $action $entity $otherPerson");
- }
-
- public static function decodeActivity($message)
- {
- $pattern = '/\[([\w]*):([\d]*):(.*)\]/i';
- preg_match($pattern, $message, $matches);
-
- if (count($matches) > 0) {
- $match = $matches[0];
- $type = $matches[1];
- $publicId = $matches[2];
- $name = $matches[3];
-
- $link = link_to($type.'s/'.$publicId, $name);
- $message = str_replace($match, "$type $link", $message);
- }
-
- return $message;
- }
-
- public static function generateLicense()
- {
- $parts = [];
- for ($i = 0; $i<5; $i++) {
- $parts[] = strtoupper(str_random(4));
- }
-
- return implode('-', $parts);
- }
-
- public static function lookupEventId($eventName)
- {
- if ($eventName == 'create_client') {
- return EVENT_CREATE_CLIENT;
- } elseif ($eventName == 'create_invoice') {
- return EVENT_CREATE_INVOICE;
- } elseif ($eventName == 'create_quote') {
- return EVENT_CREATE_QUOTE;
- } elseif ($eventName == 'create_payment') {
- return EVENT_CREATE_PAYMENT;
- } else {
- return false;
- }
- }
-
- public static function notifyZapier($subscription, $data)
- {
- $curl = curl_init();
-
- $jsonEncodedData = json_encode($data->toJson());
- $opts = [
- CURLOPT_URL => $subscription->target_url,
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_CUSTOMREQUEST => 'POST',
- CURLOPT_POST => 1,
- CURLOPT_POSTFIELDS => $jsonEncodedData,
- CURLOPT_HTTPHEADER => ['Content-Type: application/json', 'Content-Length: '.strlen($jsonEncodedData)],
- ];
-
- curl_setopt_array($curl, $opts);
-
- $result = curl_exec($curl);
- $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-
- curl_close($curl);
-
- if ($status == 410) {
- $subscription->delete();
- }
- }
-
-
- public static function remapPublicIds(array $data)
- {
- $return = [];
-
- foreach ($data as $key => $val) {
- if ($key === 'public_id') {
- $key = 'id';
- } elseif (strpos($key, '_id')) {
- continue;
- }
-
- if (is_array($val)) {
- $val = Utils::remapPublicIds($val);
- }
-
- $return[$key] = $val;
- }
-
- return $return;
- }
-
- public static function getApiHeaders($count = 0)
- {
- return [
- 'Content-Type' => 'application/json',
- //'Access-Control-Allow-Origin' => '*',
- //'Access-Control-Allow-Methods' => 'GET',
- //'Access-Control-Allow-Headers' => 'Origin, Content-Type, Accept, Authorization, X-Requested-With',
- //'Access-Control-Allow-Credentials' => 'true',
- 'X-Total-Count' => $count,
- //'X-Rate-Limit-Limit' - The number of allowed requests in the current period
- //'X-Rate-Limit-Remaining' - The number of remaining requests in the current period
- //'X-Rate-Limit-Reset' - The number of seconds left in the current period,
- ];
- }
-
- public static function startsWith($haystack, $needle)
- {
- return $needle === "" || strpos($haystack, $needle) === 0;
- }
-
- public static function endsWith($haystack, $needle)
- {
- return $needle === "" || substr($haystack, -strlen($needle)) === $needle;
- }
-
- public static function getEntityRowClass($model)
- {
- $str = $model->is_deleted || ($model->deleted_at && $model->deleted_at != '0000-00-00') ? 'DISABLED ' : '';
-
- if ($model->is_deleted) {
- $str .= 'ENTITY_DELETED ';
- }
-
- if ($model->deleted_at && $model->deleted_at != '0000-00-00') {
- $str .= 'ENTITY_ARCHIVED ';
- }
-
- return $str;
- }
-}
diff --git a/bootstrap/environment.php b/bootstrap/environment.php
new file mode 100644
index 000000000000..d206619103de
--- /dev/null
+++ b/bootstrap/environment.php
@@ -0,0 +1 @@
+ 'App\Libraries\Utils',
'Form' => 'Illuminate\Html\FormFacade',
'HTML' => 'Illuminate\Html\HtmlFacade',
'SSH' => 'Illuminate\Support\Facades\SSH',
- 'Alert' => 'Bootstrapper\Alert',
- 'Badge' => 'Bootstrapper\Badge',
- 'Breadcrumb' => 'Bootstrapper\Breadcrumb',
- 'Button' => 'Bootstrapper\Button',
- 'ButtonGroup' => 'Bootstrapper\ButtonGroup',
- 'ButtonToolbar' => 'Bootstrapper\ButtonToolbar',
- 'Carousel' => 'Bootstrapper\Carousel',
- 'DropdownButton' => 'Bootstrapper\DropdownButton',
- 'Form' => 'Bootstrapper\Form',
- 'Helpers' => 'Bootstrapper\Helpers',
- 'Icon' => 'Bootstrapper\Icon',
- //'Image' => 'Bootstrapper\Image',
- 'Label' => 'Bootstrapper\Label',
- 'MediaObject' => 'Bootstrapper\MediaObject',
- 'Navbar' => 'Bootstrapper\Navbar',
- 'Navigation' => 'Bootstrapper\Navigation',
- 'Paginator' => 'Bootstrapper\Paginator',
- 'Progress' => 'Bootstrapper\Progress',
- 'Tabbable' => 'Bootstrapper\Tabbable',
- 'Table' => 'Bootstrapper\Table',
- 'Thumbnail' => 'Bootstrapper\Thumbnail',
- 'Typeahead' => 'Bootstrapper\Typeahead',
- 'Typography' => 'Bootstrapper\Typography',
+ 'Alert' => 'Bootstrapper\Facades\Alert',
+ 'Badge' => 'Bootstrapper\Facades\Badge',
+ 'Breadcrumb' => 'Bootstrapper\Facades\Breadcrumb',
+ 'Button' => 'Bootstrapper\Facades\Button',
+ 'ButtonGroup' => 'Bootstrapper\Facades\ButtonGroup',
+ 'ButtonToolbar' => 'Bootstrapper\Facades\ButtonToolbar',
+ 'Carousel' => 'Bootstrapper\Facades\Carousel',
+ 'DropdownButton' => 'Bootstrapper\Facades\DropdownButton',
+ 'Form' => 'Bootstrapper\Facades\Form',
+ 'Helpers' => 'Bootstrapper\Facades\Helpers',
+ 'Icon' => 'Bootstrapper\Facades\Icon',
+ //'Image' => 'Bootstrapper\Facades\Image',
+ 'Label' => 'Bootstrapper\Facades\Label',
+ 'MediaObject' => 'Bootstrapper\Facades\MediaObject',
+ 'Navbar' => 'Bootstrapper\Facades\Navbar',
+ 'Navigation' => 'Bootstrapper\Facades\Navigation',
+ 'Paginator' => 'Bootstrapper\Facades\Paginator',
+ 'Progress' => 'Bootstrapper\Facades\Progress',
+ 'Tabbable' => 'Bootstrapper\Facades\Tabbable',
+ 'Table' => 'Bootstrapper\Facades\Table',
+ 'Thumbnail' => 'Bootstrapper\Facades\Thumbnail',
+ 'Typeahead' => 'Bootstrapper\Facades\Typeahead',
+ 'Typography' => 'Bootstrapper\Facades\Typography',
'Former' => 'Former\Facades\Former',
'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
'Omnipay' => 'Omnipay\Omnipay',
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index 4a0ffa52ea6e..3dd433d90267 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -34,7 +34,7 @@ FLUSH PRIVILEGES;
- {{ Former::open()->rules([
+ {!! Former::open()->rules([
'app[url]' => 'required',
'database[type][host]' => 'required',
'database[type][database]' => 'required',
@@ -45,14 +45,14 @@ FLUSH PRIVILEGES;
'email' => 'required|email',
'password' => 'required',
'terms_checkbox' => 'required'
- ]) }}
+ ]) !!}
Application Settings
- {{ Former::text('app[url]')->label('URL')->value(Request::root()) }}
+ {!! Former::text('app[url]')->label('URL')->value(Request::root()) !!}
@@ -61,12 +61,12 @@ FLUSH PRIVILEGES;
Database Connection
- {{ Former::select('database[default]')->label('Driver')->options(['mysql' => 'MySQL', 'pgsql' => 'PostgreSQL', 'sqlite' => 'SQLite']) }}
- {{ Former::text('database[type][host]')->label('Host')->value('localhost') }}
- {{ Former::text('database[type][database]')->label('Database')->value('ninja') }}
- {{ Former::text('database[type][username]')->label('Username')->value('ninja') }}
- {{ Former::password('database[type][password]')->label('Password')->value('ninja') }}
- {{ Former::actions( Button::normal('Test connection', ['onclick' => 'testDatabase()']), ' ' ) }}
+ {!! Former::select('database[default]')->label('Driver')->options(['mysql' => 'MySQL', 'pgsql' => 'PostgreSQL', 'sqlite' => 'SQLite']) !!}
+ {!! Former::text('database[type][host]')->label('Host')->value('localhost') !!}
+ {!! Former::text('database[type][database]')->label('Database')->value('ninja') !!}
+ {!! Former::text('database[type][username]')->label('Username')->value('ninja') !!}
+ {!! Former::password('database[type][password]')->label('Password')->value('ninja') !!}
+ {!! Former::actions( Button::normal('Test connection', ['onclick' => 'testDatabase()']), ' ' ) !!}
@@ -76,14 +76,14 @@ FLUSH PRIVILEGES;
Email Settings
- {{ Former::select('mail[driver]')->label('Driver')->options(['smtp' => 'SMTP', 'mail' => 'Mail', 'sendmail' => 'Sendmail']) }}
- {{ Former::text('mail[host]')->label('Host')->value('localhost') }}
- {{ Former::text('mail[port]')->label('Port')->value('587') }}
- {{ Former::select('mail[encryption]')->label('Encryption')->options(['tls' => 'TLS', 'ssl' => 'SSL']) }}
- {{ Former::text('mail[from][name]')->label('From Name') }}
- {{ Former::text('mail[username]')->label('Email') }}
- {{ Former::password('mail[password]')->label('Password') }}
- {{ Former::actions( Button::normal('Send test email', ['onclick' => 'testMail()']), ' ' ) }}
+ {!! Former::select('mail[driver]')->label('Driver')->options(['smtp' => 'SMTP', 'mail' => 'Mail', 'sendmail' => 'Sendmail']) !!}
+ {!! Former::text('mail[host]')->label('Host')->value('localhost') !!}
+ {!! Former::text('mail[port]')->label('Port')->value('587') !!}
+ {!! Former::select('mail[encryption]')->label('Encryption')->options(['tls' => 'TLS', 'ssl' => 'SSL']) !!}
+ {!! Former::text('mail[from][name]')->label('From Name') !!}
+ {!! Former::text('mail[username]')->label('Email') !!}
+ {!! Former::password('mail[password]')->label('Password') !!}
+ {!! Former::actions( Button::normal('Send test email', ['onclick' => 'testMail()']), ' ' ) !!}
@@ -93,16 +93,16 @@ FLUSH PRIVILEGES;
User Details
- {{ Former::text('first_name') }}
- {{ Former::text('last_name') }}
- {{ Former::text('email') }}
- {{ Former::password('password') }}
+ {!! Former::text('first_name') !!}
+ {!! Former::text('last_name') !!}
+ {!! Former::text('email') !!}
+ {!! Former::password('password') !!}
- {{ Former::checkbox('terms_checkbox')->label(' ')->text(trans('texts.agree_to_terms', ['terms' => ''.trans('texts.terms_of_service').''])) }}
- {{ Former::actions( Button::submit_lg('Submit') ) }}
- {{ Former::close() }}
+ {!! Former::checkbox('terms_checkbox')->label(' ')->text(trans('texts.agree_to_terms', ['terms' => ''.trans('texts.terms_of_service').''])) !!}
+ {!! Former::actions( Button::primary('Submit')->submit() ) !!}
+ {!! Former::close() !!}
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
new file mode 100644
index 000000000000..c96a04f008ee
--- /dev/null
+++ b/storage/debugbar/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file