RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Merge conflict with development

Browse Source
This commit is contained in:
Sebastian Grewe 2014-07-25 09:52:45 +02:00
parent 2b49325ff5
commit 277c31af58
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/version.inc.php
View File

@ -2,7 +2,7 @@
$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
define('MPOS_VERSION', '0.0.4'); define('MPOS_VERSION', '0.0.4');
define('DB_VERSION', '0.0.14'); define('DB_VERSION', '0.0.15');
define('CONFIG_VERSION', '0.0.8'); define('CONFIG_VERSION', '0.0.8');
define('HASH_VERSION', 1); define('HASH_VERSION', 1);

8
upgrade/definitions/0.0.13_to_0.0.14.inc.php → upgrade/definitions/0.0.14_to_0.0.15.inc.php
View File

@ -1,16 +1,16 @@
<?php <?php
function run_0014() { function run_0015() {
// Ugly but haven't found a better way // Ugly but haven't found a better way
global $setting, $config, $user, $mysqli, $transaction; global $setting, $config, $user, $mysqli, $transaction;
// Version information // Version information
$db_version_old = '0.0.13'; // What version do we expect $db_version_old = '0.0.14'; // What version do we expect
$db_version_new = '0.0.14'; // What is the new version we wish to upgrade to $db_version_new = '0.0.15'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed $db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables // Upgrade specific variables
$aSql[] = "ALTER TABLE " . $transaction->getTableName() . " CHANGE `amount` `amount` DECIMAL(50,30) NULL DEFAULT '0'"; $aSql[] = "ALTER TABLE " . $transaction->getTableName() . " CHANGE `amount` `amount` DECIMAL(50,30) NULL DEFAULT '0'";
$aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.14' WHERE name = 'DB_VERSION'"; $aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.15' WHERE name = 'DB_VERSION'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) { if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
// Run the upgrade // Run the upgrade