diff --git a/VERSION.txt b/VERSION.txt index 240bf8ead1..2ea33cb9e7 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.6.16 \ No newline at end of file +5.6.17 \ No newline at end of file diff --git a/app/Http/Middleware/Cors.php b/app/Http/Middleware/Cors.php index 82926e3ddb..46da7d2241 100644 --- a/app/Http/Middleware/Cors.php +++ b/app/Http/Middleware/Cors.php @@ -15,7 +15,7 @@ class Cors // ALLOW OPTIONS METHOD $headers = [ 'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE', - 'Access-Control-Allow-Headers'=> 'X-React,X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE', + 'Access-Control-Allow-Headers'=> 'X-CLIENT-PLATFORM,X-React,X-API-PASSWORD-BASE64,X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Disposition,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE', ]; return Response::make('OK', 200, $headers); diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php index e6ce637680..dc8889dda8 100644 --- a/app/Utils/Traits/MakesInvoiceHtml.php +++ b/app/Utils/Traits/MakesInvoiceHtml.php @@ -44,29 +44,29 @@ trait MakesInvoiceHtml return Blade::render($string, $data); //potential fix for removing eval() - $php = Blade::compileString($string); + // $php = Blade::compileString($string); - $obLevel = ob_get_level(); - ob_start(); - extract($data, EXTR_SKIP); + // $obLevel = ob_get_level(); + // ob_start(); + // extract($data, EXTR_SKIP); - try { - eval('?'.'>'.$php); - } catch (Exception $e) { - while (ob_get_level() > $obLevel) { - ob_end_clean(); - } + // try { + // eval('?'.'>'.$php); + // } catch (Exception $e) { + // while (ob_get_level() > $obLevel) { + // ob_end_clean(); + // } - throw $e; - } catch (Throwable $e) { - while (ob_get_level() > $obLevel) { - ob_end_clean(); - } + // throw $e; + // } catch (Throwable $e) { + // while (ob_get_level() > $obLevel) { + // ob_end_clean(); + // } - throw new \Exception($e->getMessage()); - } + // throw new \Exception($e->getMessage()); + // } - return ob_get_clean(); + // return ob_get_clean(); } /* diff --git a/config/ninja.php b/config/ninja.php index 0bd015f987..bf14dd03b0 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION','5.6.16'), - 'app_tag' => env('APP_TAG','5.6.16'), + 'app_version' => env('APP_VERSION','5.6.17'), + 'app_tag' => env('APP_TAG','5.6.17'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),