Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Working on fees

Browse Source
This commit is contained in:
David Bomba 2020-08-28 11:06:46 +10:00
parent a5248f7a93
commit 36c54d8cc3
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/DataMapper/CompanySettings.php
View File

@ -238,8 +238,13 @@ class CompanySettings extends BaseSettings
public $client_portal_terms = ''; public $client_portal_terms = '';
public $client_portal_privacy_policy = ''; public $client_portal_privacy_policy = '';
public $client_portal_enable_uploads = false; public $client_portal_enable_uploads = false;
public $client_portal_allow_under_payment = false;
public $client_portal_allow_over_payment = false;
public static $casts = [ public static $casts = [
'client_portal_allow_under_payment' => 'bool',
'client_portal_allow_over_payment' => 'bool',
'auto_bill' => 'string', 'auto_bill' => 'string',
'lock_invoices' => 'string', 'lock_invoices' => 'string',
'client_portal_terms' => 'string', 'client_portal_terms' => 'string',

1
app/Http/Controllers/MigrationController.php
View File

@ -31,7 +31,6 @@ class MigrationController extends BaseController
parent::__construct(); parent::__construct();
} }
/** /**
* *
* Purge Company * Purge Company

8
app/Jobs/Util/Import.php
View File

@ -227,6 +227,14 @@ class Import implements ShouldQueue
unset($data['account_id']); unset($data['account_id']);
} }
if(isset($data['referral_code'])) {
$account = $this->company->account;
$account->referral_code = $data['referral_code'];
$account->save();
unset($data['referral_code']);
}
$company_repository = new CompanyRepository(); $company_repository = new CompanyRepository();
$company_repository->save($data, $this->company); $company_repository->save($data, $this->company);

7
app/Models/CompanyGateway.php
View File

@ -201,7 +201,12 @@ class CompanyGateway extends BaseModel
return floatval($this->fee_amount) || floatval($this->fee_percent); return floatval($this->fee_amount) || floatval($this->fee_percent);
} }
public function isTestMode() /**
* Returns the current test mode of the gateway
*
* @return boolean whether the gateway is in testmode or not.
*/
public function isTestMode() :bool
{ {
$config = $this->getConfig(); $config = $this->getConfig();

6
database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
View File

@ -47,9 +47,9 @@ class AddIsPublicToDocumentsTable extends Migration
$table->string('auto_bill'); $table->string('auto_bill');
}); });
Schema::table('recurring_expenses', function ($table) { // Schema::table('recurring_expenses', function ($table) {
$table->table('auto_bill'); // $table->string('auto_bill');
}); // });
Schema::table('companies', function ($table) { Schema::table('companies', function ($table) {
$table->enum('default_auto_bill', ['off', 'always','optin','optout'])->default('off'); $table->enum('default_auto_bill', ['off', 'always','optin','optout'])->default('off');