Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for conflict

Browse Source
This commit is contained in:
David Bomba 2020-08-29 22:17:47 +10:00
commit ccdb55223c
7 changed files with 45 additions and 2 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_privacy_policy = '';
public $client_portal_enable_uploads = false;
public $client_portal_allow_under_payment = false;
public $client_portal_allow_over_payment = false;
public static $casts = [
'client_portal_allow_under_payment' => 'bool',
'client_portal_allow_over_payment' => 'bool',
'auto_bill' => 'string',
'lock_invoices' => 'string',
'client_portal_terms' => 'string',

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

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

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

@ -227,6 +227,14 @@ class Import implements ShouldQueue
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->save($data, $this->company);

17
app/Models/CompanyGateway.php
View File

@ -201,6 +201,23 @@ class CompanyGateway extends BaseModel
return floatval($this->fee_amount) || floatval($this->fee_percent);
}
/**
* 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();
if($this->gateway->provider == 'Stripe' && strpos($config->publishableKey, 'test'))
return true;
if(property_exists($config, 'testMode') && $config->testMode)
return true;
return false;
}
/**
* Get Publishable Key
* Only works for STRIPE and PAYMILL

2
app/Observers/CompanyGatewayObserver.php
View File

@ -14,6 +14,8 @@ class CompanyGatewayObserver
*/
public function created(CompanyGateway $company_gateway)
{
/* Set company gateway if not exists*/
if(!$company_gateway->label){
$company_gateway->label = $company_gateway->gateway->name;
$company_gateway->save();

12
database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
View File

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