commit
a8335bf56a
|
@ -186,7 +186,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
ls
|
ls
|
||||||
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
|
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
|
||||||
echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging" ] ]; ?>' > deployment_remotes.php
|
echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
|
||||||
cat deployment_remotes.php
|
cat deployment_remotes.php
|
||||||
ls
|
ls
|
||||||
php deployment.phar deployment.php --section staging
|
php deployment.phar deployment.php --section staging
|
||||||
|
@ -232,7 +232,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
ls
|
ls
|
||||||
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
|
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
|
||||||
echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod" ] ]; ?>' > deployment_remotes.php
|
echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
|
||||||
cat deployment_remotes.php
|
cat deployment_remotes.php
|
||||||
ls
|
ls
|
||||||
php deployment.phar deployment.php --section production
|
php deployment.phar deployment.php --section production
|
||||||
|
|
|
@ -3,19 +3,7 @@ require_once 'core.php';
|
||||||
|
|
||||||
init_class(false);
|
init_class(false);
|
||||||
header('Content-Type: application/json');
|
header('Content-Type: application/json');
|
||||||
|
|
||||||
function customErrorHandler(int $errNo, string $errMsg, string $file, int $line)
|
|
||||||
{
|
|
||||||
$output = [
|
|
||||||
"errNo" => $errNo,
|
|
||||||
"error" => $errMsg,
|
|
||||||
"file" => $file,
|
|
||||||
"line" => $line
|
|
||||||
];
|
|
||||||
var_dump($output);
|
|
||||||
}
|
|
||||||
error_reporting(-1);
|
error_reporting(-1);
|
||||||
set_error_handler('customErrorHandler');
|
|
||||||
|
|
||||||
list($cronJobDay, $cronJobTime) = explode(";", $database->get_option("cron_job_time"));
|
list($cronJobDay, $cronJobTime) = explode(";", $database->get_option("cron_job_time"));
|
||||||
|
|
||||||
|
@ -73,7 +61,7 @@ if($start) {
|
||||||
$increment[$id] = $value;
|
$increment[$id] = $value;
|
||||||
$database->exec("UPDATE %PREFIX%_profiles SET availability_minutes = :value WHERE id = :id", true, [":value" => $value, ":id" => $id]);
|
$database->exec("UPDATE %PREFIX%_profiles SET availability_minutes = :value WHERE id = :id", true, [":value" => $value, ":id" => $id]);
|
||||||
$tmp = $id . " - " . $value . " ";
|
$tmp = $id . " - " . $value . " ";
|
||||||
$tmp .= count($database->stmt->rowCount()) == 1 ? "success" : "fail";
|
$tmp .= $database->stmt->rowCount() == 1 ? "success" : "fail";
|
||||||
$queries[] = $tmp;
|
$queries[] = $tmp;
|
||||||
}
|
}
|
||||||
$output[] = $queries;
|
$output[] = $queries;
|
||||||
|
|
|
@ -53,6 +53,9 @@ if(!empty($result)){
|
||||||
$old_schedules[$schedule[0]][$hour] = true;
|
$old_schedules[$schedule[0]][$hour] = true;
|
||||||
}
|
}
|
||||||
$old_holidays = json_decode($result[0]["holidays"]);
|
$old_holidays = json_decode($result[0]["holidays"]);
|
||||||
|
if(is_null($old_holidays)){
|
||||||
|
$old_holidays = [];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$old_schedules = [];
|
$old_schedules = [];
|
||||||
$old_holidays = [];
|
$old_holidays = [];
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -11,13 +11,13 @@
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "GPL3",
|
"license": "GPL3",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/core": "^7.13.16",
|
"@babel/core": "^7.14.0",
|
||||||
"@babel/plugin-transform-runtime": "^7.13.15",
|
"@babel/plugin-transform-runtime": "^7.13.15",
|
||||||
"@babel/preset-env": "^7.13.15",
|
"@babel/preset-env": "^7.14.0",
|
||||||
"@fiverr/afterbuild-webpack-plugin": "^1.0.0",
|
"@fiverr/afterbuild-webpack-plugin": "^1.0.0",
|
||||||
"@fortawesome/fontawesome-free": "^5.15.3",
|
"@fortawesome/fontawesome-free": "^5.15.3",
|
||||||
"@sentry/browser": "^6.3.3",
|
"@sentry/browser": "^6.3.4",
|
||||||
"@sentry/tracing": "^6.3.3",
|
"@sentry/tracing": "^6.3.4",
|
||||||
"@sentry/webpack-plugin": "^1.15.1",
|
"@sentry/webpack-plugin": "^1.15.1",
|
||||||
"babel-loader": "^8.2.2",
|
"babel-loader": "^8.2.2",
|
||||||
"bootstrap": "^4.6.0",
|
"bootstrap": "^4.6.0",
|
||||||
|
@ -27,9 +27,9 @@
|
||||||
"colors": "^1.4.0",
|
"colors": "^1.4.0",
|
||||||
"copy-webpack-plugin": "^8.1.1",
|
"copy-webpack-plugin": "^8.1.1",
|
||||||
"css-loader": "^5.2.4",
|
"css-loader": "^5.2.4",
|
||||||
"datatables.net-bs4": "^1.10.24",
|
"datatables.net-bs4": "^1.10.23",
|
||||||
"datatables.net-buttons-bs4": "^1.7.0",
|
"datatables.net-buttons-bs4": "^1.6.5",
|
||||||
"datatables.net-plugins": "^1.10.24",
|
"datatables.net-plugins": "^1.10.23",
|
||||||
"datatables.net-responsive-bs4": "^2.2.7",
|
"datatables.net-responsive-bs4": "^2.2.7",
|
||||||
"expose-loader": "^2.0.0",
|
"expose-loader": "^2.0.0",
|
||||||
"file-loader": "^6.2.0",
|
"file-loader": "^6.2.0",
|
||||||
|
|
Loading…
Reference in New Issue