shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgraded apexchart package

Browse Source
This commit is contained in:
Denis Duliçi 2022-06-16 17:57:43 +03:00
parent c06822f8fa
commit 93be1cc132
6 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Abstracts/Report.php
View File

@ -2,7 +2,7 @@
namespace App\Abstracts; namespace App\Abstracts;
use Akaunting\Apexcharts\Charts as Apexcharts; use Akaunting\Apexcharts\Chart;
use App\Events\Report\DataLoaded; use App\Events\Report\DataLoaded;
use App\Events\Report\DataLoading; use App\Events\Report\DataLoading;
use App\Events\Report\FilterApplying; use App\Events\Report\FilterApplying;
@ -14,7 +14,6 @@ use App\Exports\Common\Reports as Export;
use App\Models\Common\Report as Model; use App\Models\Common\Report as Model;
use App\Models\Document\Document; use App\Models\Document\Document;
use App\Models\Setting\Category; use App\Models\Setting\Category;
use App\Traits\Charts;
use App\Traits\DateTime; use App\Traits\DateTime;
use App\Traits\SearchString; use App\Traits\SearchString;
use App\Traits\Translations; use App\Traits\Translations;
@ -24,7 +23,7 @@ use Illuminate\Support\Str;
abstract class Report abstract class Report
{ {
use Charts, DateTime, SearchString, Translations; use DateTime, SearchString, Translations;
public $model; public $model;
@ -176,7 +175,7 @@ abstract class Report
public function getBarChart($table_key) public function getBarChart($table_key)
{ {
$chart = new Apexcharts(); $chart = new Chart();
if (empty($this->chart)) { if (empty($this->chart)) {
return $chart; return $chart;
@ -194,7 +193,7 @@ abstract class Report
public function getDonutChart($table_key) public function getDonutChart($table_key)
{ {
$chart = new Apexcharts(); $chart = new Chart();
if (empty($this->chart)) { if (empty($this->chart)) {
return $chart; return $chart;

6
app/Traits/Charts.php
View File

@ -2,7 +2,7 @@
namespace App\Traits; namespace App\Traits;
use Akaunting\Apexcharts\Charts as Apexcharts; use Akaunting\Apexcharts\Chart;
trait Charts trait Charts
{ {
@ -54,7 +54,7 @@ trait Charts
$labels[$id] = $this->donut['labels'][$id]; $labels[$id] = $this->donut['labels'][$id];
} }
$chart = new Apexcharts(); $chart = new Chart();
$chart->setType('donut') $chart->setType('donut')
->setWidth($width) ->setWidth($width)
@ -75,7 +75,7 @@ trait Charts
public function getBarChart($name, $width = '100%', $height = 160) public function getBarChart($name, $width = '100%', $height = 160)
{ {
$chart = new Apexcharts(); $chart = new Chart();
$chart->setType('bar') $chart->setType('bar')
->setWidth($width) ->setWidth($width)

4
app/Widgets/CashFlow.php
View File

@ -2,7 +2,7 @@
namespace App\Widgets; namespace App\Widgets;
use Akaunting\Apexcharts\Charts as Apexcharts; use Akaunting\Apexcharts\Chart;
use App\Abstracts\Widget; use App\Abstracts\Widget;
use App\Models\Banking\Transaction; use App\Models\Banking\Transaction;
use App\Traits\Currencies; use App\Traits\Currencies;
@ -55,7 +55,7 @@ class CashFlow extends Widget
], ],
]; ];
$chart = new Apexcharts(); $chart = new Chart();
$chart->setType('line') $chart->setType('line')
->setOptions($options) ->setOptions($options)

4
app/Widgets/ProfitLoss.php
View File

@ -6,7 +6,7 @@ use App\Abstracts\Widget;
use App\Utilities\Recurring; use App\Utilities\Recurring;
use App\Models\Document\Document; use App\Models\Document\Document;
use App\Models\Banking\Transaction; use App\Models\Banking\Transaction;
use Akaunting\Apexcharts\Charts as Apexcharts; use Akaunting\Apexcharts\Chart;
use App\Traits\Currencies; use App\Traits\Currencies;
use App\Traits\DateTime; use App\Traits\DateTime;
use App\Utilities\Date; use App\Utilities\Date;
@ -39,7 +39,7 @@ class ProfitLoss extends Widget
$colors = $this->getColors(); $colors = $this->getColors();
$chart = new Apexcharts(); $chart = new Chart();
$options = [ $options = [
'legend' => [ 'legend' => [

2
composer.json
View File

@ -27,7 +27,7 @@
"ext-tokenizer": "*", "ext-tokenizer": "*",
"ext-xml": "*", "ext-xml": "*",
"ext-zip": "*", "ext-zip": "*",
"akaunting/laravel-apexcharts": "^1.0", "akaunting/laravel-apexcharts": "^2.0",
"akaunting/laravel-firewall": "^1.2", "akaunting/laravel-firewall": "^1.2",
"akaunting/laravel-language": "^1.0", "akaunting/laravel-language": "^1.0",
"akaunting/laravel-menu": "^2.0", "akaunting/laravel-menu": "^2.0",

64
composer.lock generated
View File

@ -4,27 +4,27 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "f804c45a0f63885fada71147a44bb516", "content-hash": "802a453ffd64d0ac19d6fc741b46dacc",
"packages": [ "packages": [
{ {
"name": "akaunting/laravel-apexcharts", "name": "akaunting/laravel-apexcharts",
"version": "1.0.4", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/akaunting/laravel-apexcharts.git", "url": "https://github.com/akaunting/laravel-apexcharts.git",
"reference": "84ae3484f1df9f3486b5e0bd65241b5822947ca3" "reference": "3b545508bec317c36a0cb83809de6e6cc8397832"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/akaunting/laravel-apexcharts/zipball/84ae3484f1df9f3486b5e0bd65241b5822947ca3", "url": "https://api.github.com/repos/akaunting/laravel-apexcharts/zipball/3b545508bec317c36a0cb83809de6e6cc8397832",
"reference": "84ae3484f1df9f3486b5e0bd65241b5822947ca3", "reference": "3b545508bec317c36a0cb83809de6e6cc8397832",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"balping/json-raw-encoder": "^1.0", "balping/json-raw-encoder": "^1.0",
"ext-json": "*", "ext-json": "*",
"illuminate/support": ">=8.0", "illuminate/support": ">=8.0",
"php": ">=7.3" "php": ">=8.0"
}, },
"require-dev": { "require-dev": {
"orchestra/testbench": ">=6.0", "orchestra/testbench": ">=6.0",
@ -70,9 +70,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/akaunting/laravel-apexcharts/issues", "issues": "https://github.com/akaunting/laravel-apexcharts/issues",
"source": "https://github.com/akaunting/laravel-apexcharts/tree/1.0.4" "source": "https://github.com/akaunting/laravel-apexcharts/tree/2.0.1"
}, },
"time": "2022-02-23T12:26:06+00:00" "time": "2022-06-16T14:48:25+00:00"
}, },
{ {
"name": "akaunting/laravel-debugbar-collector", "name": "akaunting/laravel-debugbar-collector",
@ -906,16 +906,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.225.1", "version": "3.225.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "b795c9c14997dac771f66d1f6cbadb62c742373a" "reference": "09b404c6b80b9c31be15fa245e647a2f9fb5e733"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b795c9c14997dac771f66d1f6cbadb62c742373a", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/09b404c6b80b9c31be15fa245e647a2f9fb5e733",
"reference": "b795c9c14997dac771f66d1f6cbadb62c742373a", "reference": "09b404c6b80b9c31be15fa245e647a2f9fb5e733",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -991,9 +991,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.225.1" "source": "https://github.com/aws/aws-sdk-php/tree/3.225.5"
}, },
"time": "2022-06-09T18:19:43+00:00" "time": "2022-06-15T19:35:13+00:00"
}, },
{ {
"name": "balping/json-raw-encoder", "name": "balping/json-raw-encoder",
@ -5225,16 +5225,16 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "3.0.20", "version": "3.0.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "42a2f47dcf39944e2aee1b660ee55ab6ef69b535" "reference": "8f1fcf9d2304ff77a006aa36dd2cb5f236999b12"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/42a2f47dcf39944e2aee1b660ee55ab6ef69b535", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8f1fcf9d2304ff77a006aa36dd2cb5f236999b12",
"reference": "42a2f47dcf39944e2aee1b660ee55ab6ef69b535", "reference": "8f1fcf9d2304ff77a006aa36dd2cb5f236999b12",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5295,7 +5295,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/flysystem/issues", "issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.0.20" "source": "https://github.com/thephpleague/flysystem/tree/3.0.21"
}, },
"funding": [ "funding": [
{ {
@ -5311,20 +5311,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-25T19:18:39+00:00" "time": "2022-06-12T17:54:28+00:00"
}, },
{ {
"name": "league/flysystem-aws-s3-v3", "name": "league/flysystem-aws-s3-v3",
"version": "3.0.13", "version": "3.0.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
"reference": "0074cf016e21a6d1eb99b6db70acdd23743fc371" "reference": "f4ee238279f1eb39a32539a18ef845db7251fd05"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/0074cf016e21a6d1eb99b6db70acdd23743fc371", "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/f4ee238279f1eb39a32539a18ef845db7251fd05",
"reference": "0074cf016e21a6d1eb99b6db70acdd23743fc371", "reference": "f4ee238279f1eb39a32539a18ef845db7251fd05",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5365,9 +5365,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
"source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.0.13" "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.0.21"
}, },
"time": "2022-04-01T22:05:11+00:00" "time": "2022-06-12T17:34:31+00:00"
}, },
{ {
"name": "league/mime-type-detection", "name": "league/mime-type-detection",
@ -13932,16 +13932,16 @@
}, },
{ {
"name": "spatie/laravel-ignition", "name": "spatie/laravel-ignition",
"version": "1.2.4", "version": "1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/laravel-ignition.git", "url": "https://github.com/spatie/laravel-ignition.git",
"reference": "b90026ba26fe6589101dc5cd6527846290560aea" "reference": "5409e699fc19f4d53e59427445b08f90593fda28"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/b90026ba26fe6589101dc5cd6527846290560aea", "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/5409e699fc19f4d53e59427445b08f90593fda28",
"reference": "b90026ba26fe6589101dc5cd6527846290560aea", "reference": "5409e699fc19f4d53e59427445b08f90593fda28",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -14018,7 +14018,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-06-08T07:07:57+00:00" "time": "2022-06-15T13:55:18+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",
@ -14178,5 +14178,5 @@
"ext-zip": "*" "ext-zip": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.2.0"
} }