horeca/admin-php-module
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v.2.31

Browse Source 
Исправлено получение наименований блюд
This commit is contained in:
miroman-afk
2023-08-11 11:39:48 +03:00
parent e9c99df7e3
commit ee1ad42c38
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
models/Dishes.php
View File

@@ -14,11 +14,11 @@ class Dishes extends Model {
protected $guarded = []; protected $guarded = [];
public static function getName($data) { public static function getName($data) {
$dish_name = self::where('code', $data)->where('is_history', 0)->first(); $dish_name = self::where('legacy_code', $data)->where('is_history', 0)->first();
if ($dish_name) { if ($dish_name) {
$dish_name = $dish_name['name']; $dish_name = $dish_name['name'];
} else { } else {
$dish_name = self::where('code', $data)->where('is_history', 1)->first(); $dish_name = self::where('legacy_code', $data)->where('is_history', 1)->first();
if ($dish_name) { if ($dish_name) {
$dish_name = $dish_name['name']; $dish_name = $dish_name['name'];
} else { } else {
@@ -26,11 +26,11 @@ class Dishes extends Model {
} }
} }
if ($dish_name == 'Связанный товар удален') { if ($dish_name == 'Связанный товар удален') {
$dish_name = self::where('legacy_code', $data)->where('is_history', 0)->first(); $dish_name = self::where('code', $data)->where('is_history', 0)->first();
if ($dish_name) { if ($dish_name) {
$dish_name = $dish_name['name']; $dish_name = $dish_name['name'];
} else { } else {
$dish_name = self::where('legacy_code', $data)->where('is_history', 1)->first(); $dish_name = self::where('code', $data)->where('is_history', 1)->first();
if ($dish_name) { if ($dish_name) {
$dish_name = $dish_name['name']; $dish_name = $dish_name['name'];
} else { } else {

2
web/controllers/reports.js
View File

@@ -505,7 +505,6 @@
} }
} }
}).on('draw', function () { }).on('draw', function () {
$('#preload-modal').modal('hide');
counter = 1; counter = 1;
}); });
$('#table_orders tbody').on('click', 'tr.dtrg-start', function () { $('#table_orders tbody').on('click', 'tr.dtrg-start', function () {
@@ -524,6 +523,7 @@
$scope.update(); $scope.update();
Notification.success('Отчет сформирован, ожидайте загрузки!'); Notification.success('Отчет сформирован, ожидайте загрузки!');
$('#report-construct').modal(); $('#report-construct').modal();
$('#preload-modal').modal('hide');
}); });
}; };