Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from hillelcoren/master

Browse Source 
Update
This commit is contained in:
Paul-Vincent Roll 2015-02-09 10:39:13 +01:00
commit 2cec89e7f5
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/AppController.php
View File

@ -40,7 +40,7 @@ class AppController extends BaseController
$database = Input::get('database'); $database = Input::get('database');
$dbType = $database['default']; $dbType = $database['default'];
$database[$dbType] = $database['type']; $database['connections'] = [$dbType => $database['type']];
unset($database['type']); unset($database['type']);
$mail = Input::get('mail'); $mail = Input::get('mail');
@ -59,19 +59,19 @@ class AppController extends BaseController
return Redirect::to('/setup')->withInput(); return Redirect::to('/setup')->withInput();
} }
$content = "<?php return 'production';"; $content = "<?php return 'development';";
$fp = fopen(base_path()."/bootstrap/environment.php", 'w'); $fp = fopen(base_path()."/bootstrap/environment.php", 'w');
fwrite($fp, $content); fwrite($fp, $content);
fclose($fp); fclose($fp);
$configDir = app_path().'/config/production'; $configDir = app_path().'/config/development';
if (!file_exists($configDir)) { if (!file_exists($configDir)) {
mkdir($configDir); mkdir($configDir);
} }
foreach (['app' => $app, 'database' => $database, 'mail' => $mail] as $key => $config) { foreach (['app' => $app, 'database' => $database, 'mail' => $mail] as $key => $config) {
$content = '<?php return '.var_export($config, true).';'; $content = '<?php return '.var_export($config, true).';';
$fp = fopen(app_path()."/config/production/{$key}.php", 'w'); $fp = fopen(app_path()."/config/development/{$key}.php", 'w');
fwrite($fp, $content); fwrite($fp, $content);
fclose($fp); fclose($fp);
} }
@ -103,7 +103,7 @@ class AppController extends BaseController
Config::set('database.default', $dbType); Config::set('database.default', $dbType);
foreach ($database[$dbType] as $key => $val) { foreach ($database['connections'][$dbType] as $key => $val) {
Config::set("database.connections.{$dbType}.{$key}", $val); Config::set("database.connections.{$dbType}.{$key}", $val);
} }

5
app/ninja/repositories/InvoiceRepository.php
View File

@ -372,7 +372,10 @@ class InvoiceRepository
$clone->balance = $invoice->amount; $clone->balance = $invoice->amount;
// if the invoice prefix is diff than quote prefix, use the same number for the invoice // if the invoice prefix is diff than quote prefix, use the same number for the invoice
if (($account->invoice_number_prefix || $account->quote_number_prefix) && $account->invoice_number_prefix != $account->quote_number_prefix) { if (($account->invoice_number_prefix || $account->quote_number_prefix)
&& $account->invoice_number_prefix != $account->quote_number_prefix
&& $account->share_counter) {
$invoiceNumber = $invoice->invoice_number; $invoiceNumber = $invoice->invoice_number;
if (strpos($invoiceNumber, $account->quote_number_prefix) === 0) { if (strpos($invoiceNumber, $account->quote_number_prefix) === 0) {
$invoiceNumber = substr($invoiceNumber, strlen($account->quote_number_prefix)); $invoiceNumber = substr($invoiceNumber, strlen($account->quote_number_prefix));

2
bootstrap/environment.default.php
View File

@ -1,4 +1,4 @@
<?php <?php
return 'production'; return 'development';