From f8c4060a82e95a1124292fc1ee769256981d08b1 Mon Sep 17 00:00:00 2001
From: miroman-afk <74014189+miroman-afk@users.noreply.github.com>
Date: Wed, 29 Dec 2021 14:05:32 +0300
Subject: [PATCH] v.2.3

front fix
---
 commands/TopDishesNewYear.php |  8 ++---
 web/controllers/dashboard.js  | 68 +++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/commands/TopDishesNewYear.php b/commands/TopDishesNewYear.php
index 5033a20..526dc07 100644
--- a/commands/TopDishesNewYear.php
+++ b/commands/TopDishesNewYear.php
@@ -22,11 +22,11 @@ class TopDishesNewYear extends HRCCommand implements HRCCommandInterface {
 		if (!file_exists($dirname . $filename)) {
 			$info = ExchangeItems::where('menu_code', '>', 0)
 				->where('real_price', '>', 1)
-				->where('created_at', '>=', '2021-10-01 00:00:00')
+				->where('created_at', '>=', '2021-01-01 00:00:00')
 				->where('created_at', '<', '2021-12-31 23:59:59')
 				->get()
 				->unique('menu_code');
-			$count = ExchangeItems::where('menu_code', '>', 0)->where('created_at', '>=', '2021-10-01 00:00:00')->where('created_at', '<', '2021-12-31 23:59:59')->count();
+			$count = ExchangeItems::where('menu_code', '>', 0)->where('created_at', '>=', '2021-01-01 00:00:00')->where('created_at', '<', '2021-12-31 23:59:59')->count();
 			if ($count > 0) {
 				foreach ($info as $key => $value) {
 					$out[] = $value;
@@ -38,12 +38,12 @@ class TopDishesNewYear extends HRCCommand implements HRCCommandInterface {
 						->first();
 					$onlineDishInfo = ExchangeItems::where('menu_code', '=', $item['menu_code'])
 						->where('dishes_code', '=', $item['dishes_code'])
-						->where('created_at', '>=', '2021-10-01 00:00:00')
+						->where('created_at', '>=', '2021-01-01 00:00:00')
 						->where('created_at', '<', '2021-12-31 23:59:59')
 						->first();
 					$dishName = $dishInfo['name'];
 					$dishCount = ExchangeItems::where('menu_code', '=', $item['menu_code'])
-						->where('created_at', '>=', '2021-10-01 00:00:00')
+						->where('created_at', '>=', '2021-01-01 00:00:00')
 						->where('created_at', '<', '2021-12-31 23:59:59')
 						->sum('count');
 					$dishSum = $onlineDishInfo['real_price'] * $dishCount;
diff --git a/web/controllers/dashboard.js b/web/controllers/dashboard.js
index 6273bf5..42ba96f 100644
--- a/web/controllers/dashboard.js
+++ b/web/controllers/dashboard.js
@@ -25,40 +25,46 @@
 	function DashboardCtrl($scope, smartRequest, $interval, $location) {
 		$(document).ready(function() {
 			if (moment(moment().format('YYYY-MM-DD')).isAfter('2021-12-25')) {
+				console.log('moment_first_true');
 				if (moment(moment().format('YYYY-MM-DD')).isBefore('2022-01-10')) {
-			smartRequest.get('v1/topdishesnewyear', function (data) {
-				$scope.year_count = data.count;
-				$scope.top_dishes = data.dishes;
-				$scope.top_shifts = data.top_shift;
-			});
-			var delayMs = 1500; // delay in milliseconds
-			setTimeout(function(){
-				$('#get-more-newyear').modal('show');
-			}, delayMs);
-			if ($( window ).width() < 700) {
-				$('#get-more-newyear').on('show.bs.modal', function () {
-					$('.modal-dialog').css('margin',0);
-					$('.modal-content').css('height',$( window ).height()*0.95);
-					$('.modal-content').css('width',$( window ).width());
-					$('.myCarousel').css('height', $( window ).height()*0.95);
-					$('.myCarousel').css('width', 'auto');
-					$('.myCarousel').css('object-fit', 'cover');
-				});
-			} else {
-				$('#get-more-newyear').on('show.bs.modal', function () {
-					$('.modal-dialog').css('margin-right',$( window ).width()/4);
-					$('.modal-dialog').css('margin-left',$( window ).width()/4);
-					$('.modal-dialog').css('margin-top',$( window ).height()/8);
-					$('.modal-content').css('height',$( window ).height()*0.7);
-					$('.modal-content').css('width',$( window ).width()*0.5);
-					$('.myCarousel').css('height', $( window ).height()*0.7);
-					$('.myCarousel').css('width', 'auto');
-					$('.myCarousel').css('object-fit', 'cover');
-				});
-			}
-			}
+					console.log('moment_second_true');
+					var delayMs = 1500; // delay in milliseconds
+					console.log('delay_true');
+					setTimeout(function(){
+						$('#get-more-newyear').modal('show');
+					}, delayMs);
+					console.log('modal_true');
+					if ($( window ).width() < 700) {
+						$('#get-more-newyear').on('show.bs.modal', function () {
+							$('.modal-dialog').css('margin',0);
+							$('.modal-content').css('height',$( window ).height()*0.95);
+							$('.modal-content').css('width',$( window ).width());
+							$('.myCarousel').css('height', $( window ).height()*0.95);
+							$('.myCarousel').css('width', 'auto');
+							$('.myCarousel').css('object-fit', 'cover');
+						});
+					} else {
+						$('#get-more-newyear').on('show.bs.modal', function () {
+							$('.modal-dialog').css('margin-right',$( window ).width()/4);
+							$('.modal-dialog').css('margin-left',$( window ).width()/4);
+							$('.modal-dialog').css('margin-top',$( window ).height()/8);
+							$('.modal-content').css('height',$( window ).height()*0.7);
+							$('.modal-content').css('width',$( window ).width()*0.5);
+							$('.myCarousel').css('height', $( window ).height()*0.7);
+							$('.myCarousel').css('width', 'auto');
+							$('.myCarousel').css('object-fit', 'cover');
+						});
+					}
+					smartRequest.get('v1/topdishesnewyear', function (data) {
+						$scope.year_count = data.count;
+						$scope.top_dishes = data.dishes;
+						$scope.top_shifts = data.top_shift;
+					});
+					console.log('request_true');
+				}
 			}
 		});
+
 		$scope.nextImage = function () {
 			$('.carousel').carousel('next');
 		};