1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00

Merge pull request #5601 from turbo124/v5-develop

Fixes for PSR loading
This commit is contained in:
David Bomba 2021-05-04 22:04:22 +10:00 committed by GitHub
commit f2cf84669c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions

View File

@ -9,7 +9,7 @@
* @license https://opensource.org/licenses/AAL
*/
namespace App\DataMapper\Analytics;
namespace App\DataMapper\Analytics\Mail;
class EmailBounce
{

View File

@ -9,7 +9,7 @@
* @license https://opensource.org/licenses/AAL
*/
namespace App\DataMapper\Analytics;
namespace App\DataMapper\Analytics\Mail;
class EmailSpam
{

View File

@ -79,8 +79,9 @@ class Client extends BaseModel implements HasLocalePreference
protected $with = [
'gateway_tokens',
'documents'
//'currency',
'documents',
'contacts.company',
// 'currency',
// 'primary_contact',
// 'country',
// 'contacts',

View File

@ -85,6 +85,7 @@ class Gateway extends StaticModel
return [GatewayType::PAYPAL => ['refund' => true, 'token_billing' => false]]; //Paypal
break;
case 20:
case 56:
return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true],
GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable']],
GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false],

View File

@ -30,8 +30,8 @@ class StripeConnectGateway extends Migration
Gateway::create($gateway);
if (Ninja::isNinja()) {
Gateway::where('id', 20)->update(['visible' => 0]);
Gateway::where('id', 56)->update(['visible' => 1]);
Gateway::whereIn('id', [20])->update(['visible' => 0]);
Gateway::whereIn('id', [56])->update(['visible' => 1]);
}
}