adeliasari
/
MIF_E31222707
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated: Charts & Helpers

This commit is contained in:
Fahim 2021-08-10 19:50:04 +06:00
parent 870f52505d
commit c381a0dc40
10 changed files with 326 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Setting/Entities/Setting.php
View File

@ -12,6 +12,8 @@ class Setting extends Model
protected $guarded = [];
protected $with = ['currency'];
public function currency() {
return $this->belongsTo(Currency::class, 'default_currency_id', 'id');
}

2
Modules/Setting/Http/Controllers/SettingController.php
View File

@ -45,6 +45,8 @@ class SettingController extends Controller
'footer_text' => $request->footer_text
]);
cache()->forget('settings');
toast('Settings Updated!', 'info');
return redirect()->route('settings.index');

35
app/Helpers/helpers.php
View File

@ -2,7 +2,11 @@
if (!function_exists('settings')) {
function settings() {
$settings = cache()->remember('settings', 24*60, function () {
return \Modules\Setting\Entities\Setting::firstOrFail();
});
return $settings;
}
}
@ -13,13 +17,38 @@ if (!function_exists('format_currency')) {
}
$settings = settings();
$position = $settings->default_currency_position;
$symbol = $settings->currency->symbol;
$decimal_separator = $settings->currency->decimal_separator;
$thousand_separator = $settings->currency->thousand_separator;
if ($settings->default_currency_position == 'prefix') {
$formatted_value = $settings->currency->symbol . number_format((float) $value, 2, $settings->currency->decimal_separator, $settings->currency->thousand_separator);
if ($position == 'prefix') {
$formatted_value = $symbol . number_format((float) $value, 2, $decimal_separator, $thousand_separator);
} else {
$formatted_value = number_format((float) $value, 2, $settings->currency->decimal_separator, $settings->currency->thousand_separator) . $settings->currency->symbol;
$formatted_value = number_format((float) $value, 2, $decimal_separator, $thousand_separator) . $symbol;
}
return $formatted_value;
}
}
if (!function_exists('array_merge_numeric_values')) {
function array_merge_numeric_values() {
$arrays = func_get_args();
$merged = array();
foreach ($arrays as $array) {
foreach ($array as $key => $value) {
if (!is_numeric($value)) {
continue;
}
if (!isset($merged[$key])) {
$merged[$key] = $value;
} else {
$merged[$key] += $value;
}
}
}
return $merged;
}
}

96
app/Http/Controllers/HomeController.php
View File

@ -8,9 +8,13 @@ use Illuminate\Support\Facades\DB;
use Modules\Expense\Entities\Expense;
use Modules\Product\Entities\Product;
use Modules\Purchase\Entities\Purchase;
use Modules\Purchase\Entities\PurchasePayment;
use Modules\PurchasesReturn\Entities\PurchaseReturn;
use Modules\PurchasesReturn\Entities\PurchaseReturnPayment;
use Modules\Sale\Entities\Sale;
use Modules\Sale\Entities\SalePayment;
use Modules\SalesReturn\Entities\SaleReturn;
use Modules\SalesReturn\Entities\SaleReturnPayment;
class HomeController extends Controller
{
@ -40,6 +44,8 @@ class HomeController extends Controller
public function currentMonthChart() {
abort_if(!request()->ajax(), 404);
$currentMonthSales = Sale::whereMonth('date', date('m'))
->whereYear('date', date('Y'))
->sum('total_amount') / 100;
@ -59,6 +65,8 @@ class HomeController extends Controller
public function salesPurchasesChart() {
abort_if(!request()->ajax(), 404);
$sales = $this->salesChartData();
$purchases = $this->purchasesChartData();
@ -66,8 +74,84 @@ class HomeController extends Controller
}
public function paymentChart() {
abort_if(!request()->ajax(), 404);
$dates = collect();
foreach (range(-11, 0) as $i) {
$date = Carbon::now()->addMonths($i)->format('m-Y');
$dates->put($date, 0);
}
$date_range = Carbon::today()->subYear()->format('Y-m-d');
$sale_payments = SalePayment::where('date', '>=', $date_range)
->select([
DB::raw("DATE_FORMAT(date, '%m-%Y') as month"),
DB::raw("SUM(amount) as amount")
])
->groupBy('month')->orderBy('month')
->get()->pluck('amount', 'month');
$sale_return_payments = SaleReturnPayment::where('date', '>=', $date_range)
->select([
DB::raw("DATE_FORMAT(date, '%m-%Y') as month"),
DB::raw("SUM(amount) as amount")
])
->groupBy('month')->orderBy('month')
->get()->pluck('amount', 'month');
$purchase_payments = PurchasePayment::where('date', '>=', $date_range)
->select([
DB::raw("DATE_FORMAT(date, '%m-%Y') as month"),
DB::raw("SUM(amount) as amount")
])
->groupBy('month')->orderBy('month')
->get()->pluck('amount', 'month');
$purchase_return_payments = PurchaseReturnPayment::where('date', '>=', $date_range)
->select([
DB::raw("DATE_FORMAT(date, '%m-%Y') as month"),
DB::raw("SUM(amount) as amount")
])
->groupBy('month')->orderBy('month')
->get()->pluck('amount', 'month');
$expenses = Expense::where('date', '>=', $date_range)
->select([
DB::raw("DATE_FORMAT(date, '%m-%Y') as month"),
DB::raw("SUM(amount) as amount")
])
->groupBy('month')->orderBy('month')
->get()->pluck('amount', 'month');
$payment_received = array_merge_numeric_values($sale_payments, $purchase_return_payments);
$payment_sent = array_merge_numeric_values($purchase_payments, $sale_return_payments, $expenses);
$dates_received = $dates->merge($payment_received);
$dates_sent = $dates->merge($payment_sent);
$received_payments = [];
$sent_payments = [];
$months = [];
foreach ($dates_received as $key => $value) {
$received_payments[] = $value;
$months[] = $key;
}
foreach ($dates_sent as $key => $value) {
$sent_payments[] = $value;
}
return response()->json([
'payment_sent' => $sent_payments,
'payment_received' => $received_payments,
'months' => $months,
]);
}
public function salesChartData() {
// Build an array of the dates we want to show, the oldest first
$dates = collect();
foreach (range(-6, 0) as $i) {
$date = Carbon::now()->addDays($i)->format('d-m-y');
@ -75,17 +159,16 @@ class HomeController extends Controller
}
$date_range = Carbon::today()->subDays(6);
// Get the sales counts
$sales = Sale::where('date', '>=', $date_range)
->groupBy(DB::raw("DATE_FORMAT(date,'%d-%m-%y')"))
->orderBy('date', 'asc')
->orderBy('date')
->get([
DB::raw(DB::raw("DATE_FORMAT(date,'%d-%m-%y') as date")),
DB::raw('SUM(total_amount) AS count'),
])
->pluck('count', 'date');
// Merge the two collections;
$dates = $dates->merge($sales);
$data = [];
@ -100,7 +183,6 @@ class HomeController extends Controller
public function purchasesChartData() {
// Build an array of the dates we want to show, the oldest first
$dates = collect();
foreach (range(-6, 0) as $i) {
$date = Carbon::now()->addDays($i)->format('d-m-y');
@ -109,17 +191,15 @@ class HomeController extends Controller
$date_range = Carbon::today()->subDays(6);
// Get the purchases counts
$purchases = Purchase::where('date', '>=', $date_range)
->groupBy(DB::raw("DATE_FORMAT(date,'%d-%m-%y')"))
->orderBy('date', 'asc')
->orderBy('date')
->get([
DB::raw(DB::raw("DATE_FORMAT(date,'%d-%m-%y') as date")),
DB::raw('SUM(total_amount) AS count'),
])
->pluck('count', 'date');
// Merge the two collections;
$dates = $dates->merge($purchases);
$data = [];

75
public/js/chart-config.js vendored Normal file
View File

@ -0,0 +1,75 @@
/******/ (() => { // webpackBootstrap
var __webpack_exports__ = {};
/*!**************************************!*\
!*** ./resources/js/chart-config.js ***!
\**************************************/
$(document).ready(function () {
var salesPurchasesBar = document.getElementById('salesPurchasesChart');
$.get('/sales-purchases/chart-data', function (response) {
var salesPurchasesChart = new Chart(salesPurchasesBar, {
type: 'bar',
data: {
labels: response.sales.original.days,
datasets: [{
label: 'Sales',
data: response.sales.original.data,
backgroundColor: ['#6366F1'],
borderColor: ['#6366F1'],
borderWidth: 1
}, {
label: 'Purchases',
data: response.purchases.original.data,
backgroundColor: ['#A5B4FC'],
borderColor: ['#A5B4FC'],
borderWidth: 1
}]
},
options: {
scales: {
y: {
beginAtZero: true
}
}
}
});
});
var overviewChart = document.getElementById('currentMonthChart');
$.get('/current-month/chart-data', function (response) {
var currentMonthChart = new Chart(overviewChart, {
type: 'doughnut',
data: {
labels: ['Sales', 'Purchases', 'Expenses'],
datasets: [{
data: [response.sales, response.purchases, response.expenses],
backgroundColor: ['#F59E0B', '#0284C7', '#EF4444'],
hoverBackgroundColor: ['#F59E0B', '#0284C7', '#EF4444']
}]
}
});
});
var paymentChart = document.getElementById('paymentChart');
$.get('/payment-flow/chart-data', function (response) {
console.log(response);
var cashflowChart = new Chart(paymentChart, {
type: 'line',
data: {
labels: response.months,
datasets: [{
label: 'Payment Sent',
data: response.payment_sent,
fill: false,
borderColor: '#EA580C',
tension: 0
}, {
label: 'Payment Received',
data: response.payment_received,
fill: false,
borderColor: '#2563EB',
tension: 0
}]
}
});
});
});
/******/ })()
;

1
public/mix-manifest.json
View File

@ -1,4 +1,5 @@
{
"/js/app.js": "/js/app.js",
"/js/chart-config.js": "/js/chart-config.js",
"/css/app.css": "/css/app.css"
}

91
resources/js/chart-config.js vendored Normal file
View File

@ -0,0 +1,91 @@
$(document).ready(function () {
let salesPurchasesBar = document.getElementById('salesPurchasesChart');
$.get('/sales-purchases/chart-data', function (response) {
let salesPurchasesChart = new Chart(salesPurchasesBar, {
type: 'bar',
data: {
labels: response.sales.original.days,
datasets: [{
label: 'Sales',
data: response.sales.original.data,
backgroundColor: [
'#6366F1',
],
borderColor: [
'#6366F1',
],
borderWidth: 1
},
{
label: 'Purchases',
data: response.purchases.original.data,
backgroundColor: [
'#A5B4FC',
],
borderColor: [
'#A5B4FC',
],
borderWidth: 1
}
]
},
options: {
scales: {
y: {
beginAtZero: true
}
}
}
});
});
let overviewChart = document.getElementById('currentMonthChart');
$.get('/current-month/chart-data', function (response) {
let currentMonthChart = new Chart(overviewChart, {
type: 'doughnut',
data: {
labels: ['Sales', 'Purchases', 'Expenses'],
datasets: [{
data: [response.sales, response.purchases, response.expenses],
backgroundColor: [
'#F59E0B',
'#0284C7',
'#EF4444',
],
hoverBackgroundColor: [
'#F59E0B',
'#0284C7',
'#EF4444',
],
}]
},
});
});
let paymentChart = document.getElementById('paymentChart');
$.get('/payment-flow/chart-data', function (response) {
console.log(response)
let cashflowChart = new Chart(paymentChart, {
type: 'line',
data: {
labels: response.months,
datasets: [
{
label: 'Payment Sent',
data: response.payment_sent,
fill: false,
borderColor: '#EA580C',
tension: 0
},
{
label: 'Payment Received',
data: response.payment_received,
fill: false,
borderColor: '#2563EB',
tension: 0
},
]
},
});
});
});

90
resources/views/home.blade.php
View File

@ -9,7 +9,7 @@
@endsection
@section('content')
<div class="container-fluid mb-4">
<div class="container-fluid">
<div class="row">
<div class="col-md-6 col-lg-3">
<div class="card border-0">
@ -68,7 +68,7 @@
</div>
</div>
<div class="row">
<div class="row mb-4">
<div class="col-lg-7">
<div class="card border-0 shadow-sm h-100">
<div class="card-header">
@ -82,10 +82,25 @@
<div class="col-lg-5">
<div class="card border-0 shadow-sm h-100">
<div class="card-header">
{{ now()->format('F, Y') }}
Overview of {{ now()->format('F, Y') }}
</div>
<div class="card-body d-flex justify-content-center">
<div class="chart-container" style="position: relative; height:auto; width:280px">
<canvas id="currentMonthChart"></canvas>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="card border-0 shadow-sm">
<div class="card-header">
Monthly Cash Flow (Payment Sent & Received)
</div>
<div class="card-body">
<canvas id="currentMonthChart"></canvas>
<canvas id="paymentChart"></canvas>
</div>
</div>
</div>
@ -100,70 +115,5 @@
@endsection
@push('page_scripts')
<script>
$(document).ready(function () {
let chart1 = document.getElementById('salesPurchasesChart');
$.get('{{ route('sales-purchases.chart') }}', function (response) {
let salesPurchasesChart = new Chart(chart1, {
type: 'bar',
data: {
labels: response.sales.original.days,
datasets: [{
label: 'Sales',
data: response.sales.original.data,
backgroundColor: [
'#6366F1',
],
borderColor: [
'#6366F1',
],
borderWidth: 1
},
{
label: 'Purchases',
data: response.purchases.original.data,
backgroundColor: [
'#A5B4FC',
],
borderColor: [
'#A5B4FC',
],
borderWidth: 1
}
]
},
options: {
scales: {
y: {
beginAtZero: true
}
}
}
});
});
let chart2 = document.getElementById('currentMonthChart');
$.get('{{ route('current-month.chart') }}', function (response) {
let currentMonthChart = new Chart(chart2, {
type: 'doughnut',
data: {
labels: ['Sales', 'Purchases', 'Expenses'],
datasets: [{
data: [response.sales, response.purchases, response.expenses],
backgroundColor: [
'#F59E0B',
'#0284C7',
'#EF4444',
],
hoverBackgroundColor: [
'#F59E0B',
'#0284C7',
'#EF4444',
],
}]
},
});
});
});
</script>
<script src="{{ mix('js/chart-config.js') }}"></script>
@endpush

17
routes/web.php
View File

@ -14,12 +14,17 @@ Route::get('/', function () {
Auth::routes();
Route::get('/home', 'HomeController@index')
->name('home')->middleware('auth');
Route::group(['middleware' => 'auth'], function () {
Route::get('/home', 'HomeController@index')
->name('home');
Route::get('/sales-purchases/chart-data', 'HomeController@salesPurchasesChart')
->name('sales-purchases.chart')->middleware('auth');
Route::get('/sales-purchases/chart-data', 'HomeController@salesPurchasesChart')
->name('sales-purchases.chart');
Route::get('/current-month/chart-data', 'HomeController@currentMonthChart')
->name('current-month.chart')->middleware('auth');
Route::get('/current-month/chart-data', 'HomeController@currentMonthChart')
->name('current-month.chart');
Route::get('/payment-flow/chart-data', 'HomeController@paymentChart')
->name('payment-flow.chart');
});

1
webpack.mix.js vendored
View File

@ -12,4 +12,5 @@ const mix = require('laravel-mix');
*/
mix.js('resources/js/app.js', 'public/js')
.js('resources/js/chart-config.js', 'public/js')
.sass('resources/sass/app.scss', 'public/css');