Skip to content

Commit

Permalink
view restored
Browse files Browse the repository at this point in the history
  • Loading branch information
@fcaceresDevTech
fcaceresDevTech committed Oct 26, 2023
1 parent ae4234e commit 90bb4df
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 181 deletions.
276 changes: 139 additions & 137 deletions app/Http/Controllers/HomeController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,139 +134,141 @@ public function index()
}
}

// Chart sales last 30 days
$sells_chart_1 = null;
if (isset($dashboard_settings['sales_month']) && $dashboard_settings['sales_month'] == 1) {
$sells_chart_1 = Charts::create('bar', 'highcharts')
->title(' ')
->template('material')
->values($sell_values)
->labels($labels)
->elementLabel(__('home.total_sells', ['currency' => $currency->code]))
->responsive(true);
}

// Chart purchases last 30 days
$purchases_chart_1 = null;
if (isset($dashboard_settings['purchases_month']) && $dashboard_settings['purchases_month'] == 1) {
$purchases_chart_1 = Charts::create('bar', 'highcharts')
->title(' ')
->template('material')
->values($purchase_values)
->labels($labels)
->elementLabel(__('home.total_purchases', ['currency' => $currency->code]));
}

// Chart for stock last 30 days
$stocks_chart_1 = null;
if (isset($dashboard_settings['stock_month']) && $dashboard_settings['stock_month'] == 1) {
$stocks_chart_1 = Charts::create('bar', 'highcharts')
->title(' ')
->template('material')
->values($stock_values)
->labels($labels)
->elementLabel(__('home.total_stocks', ['currency' => $currency->code]));
}

$labels = [];

// Chart for sells this financial year
if (isset($dashboard_settings['sales_year']) && $dashboard_settings['sales_year'] == 1) {
$sells_this_fy = $this->transactionUtil->getSellsCurrentFy($business_id, $fy['start'], $fy['end']);
$sell_values = [];
}

// Purchases current financial year
if (isset($dashboard_settings['purchases_year']) && $dashboard_settings['purchases_year'] == 1) {
$purchases_this_fy = $this->transactionUtil->getPurchasesCurrentFy($business_id, $fy['start'], $fy['end']);
$purchase_values = [];
}

// Stock current financial year
if (isset($dashboard_settings['stock_year']) && $dashboard_settings['stock_year'] == 1) {
$stocks_this_fy = $this->transactionUtil->getStockCurrentFy($business_id, $fy['start']);
$stock_values = [];
}

$months = [];
$date = strtotime($fy['start']);
$last = date('m-Y', strtotime($fy['end']));

do {
$month_year = date('m-Y', $date);

$month_number = date('m', $date);

$labels[] = \Carbon::createFromFormat('m-Y', $month_year)
->format('M-Y');
$date = strtotime('+1 month', $date);

if (isset($dashboard_settings['sales_year']) && $dashboard_settings['sales_year'] == 1) {
if (! empty($sells_this_fy[$month_year])) {
$sell_values[] = $sells_this_fy[$month_year];
} else {
$sell_values[] = 0;
}
}

if (isset($dashboard_settings['purchases_year']) && $dashboard_settings['purchases_year'] == 1) {
if (! empty($purchases_this_fy[$month_year])) {
$purchase_values[] = $purchases_this_fy[$month_year];
} else {
$purchase_values[] = 0;
}
}

if (isset($dashboard_settings['stock_year']) && $dashboard_settings['stock_year'] == 1) {
if (! empty($stocks_this_fy[$month_year])) {
$stock_values[] = $stocks_this_fy[$month_year];
} else {
$stock_values[] = 0;
}
}
} while ($month_year != $last);

// Chart for sells this financial year
$sells_chart_2 = null;
if (isset($dashboard_settings['sales_year']) && $dashboard_settings['sales_year'] == 1) {
$sells_chart_2 = Charts::create('bar', 'highcharts')
->title(__(' '))
->template('material')
->values($sell_values)
->labels($labels)
->elementLabel(__(
'home.total_sells',
['currency' => $currency->code]
));
}

// Chart purchases current financial year
$purchases_chart_2 = null;
if (isset($dashboard_settings['purchases_year']) && $dashboard_settings['purchases_year'] == 1) {
$purchases_chart_2 = Charts::create('bar', 'highcharts')
->title(__(' '))
->template('material')
->values($purchase_values)
->labels($labels)
->elementLabel(__(
'home.total_purchases',
['currency' => $currency->code]
));
}

// Chart stock current financial year
$stocks_chart_2 = null;
if (isset($dashboard_settings['stock_year']) && $dashboard_settings['stock_year'] == 1) {
$stocks_chart_2 = Charts::create('bar', 'highcharts')
->title(__(' '))
->template('material')
->values($stock_values)
->labels($labels)
->elementLabel(__(
'home.total_stocks',
['currency' => $currency->code]
));
}
// Chart sales last 30 days
// $sells_chart_1 = null;
// if (isset($dashboard_settings['sales_month']) && $dashboard_settings['sales_month'] == 1) {
// $sells_chart_1 = Charts::create('bar', 'highcharts')
// ->title(' ')
// ->template('material')
// ->values($sell_values)
// ->labels($labels)
// ->elementLabel(__('home.total_sells', ['currency' => $currency->code]))
// ->responsive(true);
// }

// // Chart purchases last 30 days
// $purchases_chart_1 = null;
// if (isset($dashboard_settings['purchases_month']) && $dashboard_settings['purchases_month'] == 1) {
// $purchases_chart_1 = Charts::create('bar', 'highcharts')
// ->title(' ')
// ->template('material')
// ->values($purchase_values)
// ->labels($labels)
// ->elementLabel(__('home.total_purchases', ['currency' => $currency->code]));
// }

// // Chart for stock last 30 days
// $stocks_chart_1 = null;
// if (isset($dashboard_settings['stock_month']) && $dashboard_settings['stock_month'] == 1) {
// $stocks_chart_1 = Charts::create('bar', 'highcharts')
// ->title(' ')
// ->template('material')
// ->values($stock_values)
// ->labels($labels)
// ->elementLabel(__('home.total_stocks', ['currency' => $currency->code]));
// }

// $labels = [];

// // Chart for sells this financial year
// if (isset($dashboard_settings['sales_year']) && $dashboard_settings['sales_year'] == 1) {
// $sells_this_fy = $this->transactionUtil->getSellsCurrentFy($business_id, $fy['start'], $fy['end']);
// $sell_values = [];
// }

// // Purchases current financial year
// if (isset($dashboard_settings['purchases_year']) && $dashboard_settings['purchases_year'] == 1) {
// $purchases_this_fy = $this->transactionUtil->getPurchasesCurrentFy($business_id, $fy['start'], $fy['end']);
// $purchase_values = [];
// }

// // Stock current financial year
// if (isset($dashboard_settings['stock_year']) && $dashboard_settings['stock_year'] == 1) {
// $stocks_this_fy = $this->transactionUtil->getStockCurrentFy($business_id, $fy['start']);
// $stock_values = [];
// }

// $months = [];
// $date = strtotime($fy['start']);
// $last = date('m-Y', strtotime($fy['end']));

// do {
// $month_year = date('m-Y', $date);

// $month_number = date('m', $date);

// $labels[] = \Carbon::createFromFormat('m-Y', $month_year)
// ->format('M-Y');
// $date = strtotime('+1 month', $date);

// if (isset($dashboard_settings['sales_year']) && $dashboard_settings['sales_year'] == 1) {
// if (! empty($sells_this_fy[$month_year])) {
// $sell_values[] = $sells_this_fy[$month_year];
// } else {
// $sell_values[] = 0;
// }
// }

// if (isset($dashboard_settings['purchases_year']) && $dashboard_settings['purchases_year'] == 1) {
// if (! empty($purchases_this_fy[$month_year])) {
// $purchase_values[] = $purchases_this_fy[$month_year];
// } else {
// $purchase_values[] = 0;
// }
// }

// if (isset($dashboard_settings['stock_year']) && $dashboard_settings['stock_year'] == 1) {
// if (! empty($stocks_this_fy[$month_year])) {
// $stock_values[] = $stocks_this_fy[$month_year];
// } else {
// $stock_values[] = 0;
// }
// }
// } while ($month_year != $last);

// // Chart for sells this financial year
// $sells_chart_2 = null;
// if (isset($dashboard_settings['sales_year']) && $dashboard_settings['sales_year'] == 1) {
// $sells_chart_2 = Charts::create('bar', 'highcharts')
// ->title(__(' '))
// ->template('material')
// ->values($sell_values)
// ->labels($labels)
// ->elementLabel(__(
// 'home.total_sells',
// ['currency' => $currency->code]
// ));
// }

// // Chart purchases current financial year
// $purchases_chart_2 = null;
// if (isset($dashboard_settings['purchases_year']) && $dashboard_settings['purchases_year'] == 1) {
// $purchases_chart_2 = Charts::create('bar', 'highcharts')
// ->title(__(' '))
// ->template('material')
// ->values($purchase_values)
// ->labels($labels)
// ->elementLabel(__(
// 'home.total_purchases',
// ['currency' => $currency->code]
// ));
// }

// // Chart stock current financial year
// $stocks_chart_2 = null;
// if (isset($dashboard_settings['stock_year']) && $dashboard_settings['stock_year'] == 1) {
// $stocks_chart_2 = Charts::create('bar', 'highcharts')
// ->title(__(' '))
// ->template('material')
// ->values($stock_values)
// ->labels($labels)
// ->elementLabel(__(
// 'home.total_stocks',
// ['currency' => $currency->code]
// ));
// }

$months = [
'01' => __('accounting.january'),
Expand Down Expand Up @@ -318,12 +320,12 @@ public function index()

return view('home.index', compact(
'date_filters',
'sells_chart_1',
'sells_chart_2',
'purchases_chart_1',
'purchases_chart_2',
'stocks_chart_1',
'stocks_chart_2',
// 'sells_chart_1',
// 'sells_chart_2',
// 'purchases_chart_1',
// 'purchases_chart_2',
// 'stocks_chart_1',
// 'stocks_chart_2',
'months',
'business_locations',
'locations',
Expand Down
2 changes: 1 addition & 1 deletion app/Providers/AppServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
// DB::statement("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));");
DB::statement("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));");

if (request()->has('lang')) {
\App::setLocale(request()->get('lang'));
Expand Down
1 change: 0 additions & 1 deletion bootstrap/cache/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
'Carbon' => 'Carbon\\Carbon',
'DNS1D' => 'Milon\\Barcode\\Facades\\DNS1DFacade',
'DNS2D' => 'Milon\\Barcode\\Facades\\DNS2DFacade',
'Charts' => 'ConsoleTVs\\Charts\\Facades\\Charts',
'Datatables' => 'Yajra\\DataTables\\Facades\\DataTables',
'PDF' => 'Barryvdh\\DomPDF\\Facade',
'Excel' => 'Maatwebsite\\Excel\\Facades\\Excel',
Expand Down
2 changes: 1 addition & 1 deletion config/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
'Carbon' => 'Carbon\Carbon',
'DNS1D' => Milon\Barcode\Facades\DNS1DFacade::class,
'DNS2D' => Milon\Barcode\Facades\DNS2DFacade::class,
'Charts' => ConsoleTVs\Charts\Facades\Charts::class,
// 'Charts' => ConsoleTVs\Charts\Facades\Charts::class,
'Datatables' => Yajra\DataTables\Facades\DataTables::class,
'PDF' => Barryvdh\DomPDF\Facade::class,
'Excel' => Maatwebsite\Excel\Facades\Excel::class,
Expand Down
Loading

0 comments on commit 90bb4df

Please sign in to comment.