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

v.2.6

Browse Source 
Small fix
This commit is contained in:
miroman-afk
2022-01-20 12:03:19 +03:00
parent 104017ed96
commit cf997da7ec
10 changed files with 166 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
commands/POSTRestoreShift.php
View File

@@ -52,7 +52,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
$old_date = date_create($terminal_online['next_at']);
date_modify($old_date, '+1 hour');
$new_date = date_format($old_date, 'Y-m-d H:i:s');
if (($nowTime + 3600) >= $baseTime) {
if (($nowTime + ($terminal_online['period']*60) >= $baseTime) {
$new_terminal_online = TerminalUpdate::find($terminal_online['id']);
$new_terminal_online->next_at = $new_date;
$new_terminal_online->save();
@@ -128,7 +128,11 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
$shift_online_item->count_return = $exchange_item["count_return"];
$shift_online_item->dish_code = $exchange_item["dishes_code"];
$shift_online_item->menu_code = $exchange_item["menu_code"];
$shift_online_item->modificator_code = $exchange_item["modificator_code"];
if ($exchange_item["modificator_code"] > 0) {
$shift_online_item->modificator_code = 1;
} else {
$shift_online_item->modificator_code = 0;
}
$shift_online_item->order_code = $exchange_item["order_code"];
$shift_online_item->parent_id = $exchange_item["parent_id"];
$shift_online_item->real_price = $exchange_item["real_price"];
@@ -173,9 +177,10 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
}
$exc_time = time();
$diff_time = $exc_time - $nowTime;
$terminal_online = TerminalUpdate::where('method', 'online')->where('terminal_id', $exchange_shifts['terminal_id'])->first();
return [
'status' => 'success',
'message' => 'Смена восстановлена за ' . $diff_time . ' сек',
'message' => 'Данные автоматически синхронизируются с POS-системой ' . $terminal_online['next_at'],
];
} else {
return [

2
composer.json
View File

@@ -1,6 +1,6 @@
{
"name": "hrc-admin/hello-world",
"version": "2.4",
"version": "2.6",
"require": {
"horeca/admin-php-module-core": "dev-master"
},

8
database/migrations/2021_02_25_144800_add_value_to_exchange_actions_table.php
View File

@@ -10,11 +10,9 @@ class AddValueToExchangeActionsTable extends Migration {
* @return void
*/
public function up() {
if (!Schema::hasColumn('exchange_actions', 'value')) {
Schema::table('exchange_actions', function (Blueprint $table) {
$table->string('value', 255)->nullable()->change();
});
}
Schema::table('exchange_actions', function (Blueprint $table) {
$table->string('value', 255)->nullable()->change();
});
}
/**

53
database/migrations/2022_01_14_143043_delete_frontend_folders.php Normal file
View File

@@ -0,0 +1,53 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\Log;
class DeleteFrontendFolders extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up() {
function dirDel($dir) {
$d = opendir($dir);
while (($entry = readdir($d)) !== false) {
if ($entry != "." && $entry != "..") {
if (is_dir($dir . "/" . $entry)) {
dirDel($dir . "/" . $entry);
} else {
unlink($dir . "/" . $entry);
}
}
}
closedir($d);
rmdir($dir);
}
if (file_exists(CORE_PATH . '/../Client/web/')) {
dirDel(CORE_PATH . '/../Client/web/');
} else {
Log::debug('Client frontend already deleted!');
}
if (file_exists(CORE_PATH . '/../Shift/web/')) {
dirDel(CORE_PATH . '/../Shift/web/');
} else {
Log::debug('Shift frontend already deleted!');
}
if (file_exists(CORE_PATH . '/../Report/web/')) {
dirDel(CORE_PATH . '/../Report/web/');
} else {
Log::debug('Report frontend already deleted!');
}
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down() {
//
}
}

29
database/migrations/2022_01_19_124140_update_value_in_shift_online_actions.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateValueInShiftOnlineActions extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up() {
Schema::table('shift_online_actions', function (Blueprint $table) {
$table->string('value', 255)->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down() {
Schema::table('shift_online_actions', function (Blueprint $table) {
$table->string('value', 50)->nullable()->change();
});
}
}

29
database/migrations/2022_01_19_124519_update_more_in_shift_online_actions.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateMoreInShiftOnlineActions extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up() {
Schema::table('shift_online_actions', function (Blueprint $table) {
$table->string('more', 255)->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down() {
Schema::table('shift_online_actions', function (Blueprint $table) {
$table->string('more', 50)->nullable()->change();
});
}
}

37
database/migrations/2022_01_19_130722_create_shift_online_modificators_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateShiftOnlineModificatorsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up() {
if (!Schema::hasTable('shift_online_modificators')) {
Schema::create('shift_online_modificators', function (Blueprint $table) {
$table->id();
$table->integer('code')->nullable();
$table->string('name', 255)->nullable();
$table->integer('item_id')->nullable();
$table->integer('shift_id')->nullable();
$table->integer('terminal_id')->nullable();
$table->timestamps();
});
}
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down() {
Schema::table('shift_online_modificators', function (Blueprint $table) {
//
});
}
}

4
module.ini
View File

@@ -1,5 +1,5 @@
[info]
name=V1
version=2.4
version=2.6
[build]
version=2.4
version=2.6

3
web/controllers/dashboard.js
View File

@@ -278,6 +278,9 @@
};
$scope.update = function () {
smartRequest.get('dashboard/online/updatetime', function (data) {
$scope.update_time = data.updated;
});
smartRequest.get('dashboard/online/updatetime', function (data) {
$scope.update_time = data.updated;

2
web/controllers/shifts.js
View File

@@ -142,7 +142,7 @@
console.log(data.message);
setTimeout(function() {
location.reload();
}, 20000);
}, 5000);
}
if ($scope.status == 'error') {
Notification.error(data.message);