Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-02 22:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2022-03-08 19:46:08 +11:00
commit c45c4335cd
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Factory/CreditFactory.php
View File

@ -28,7 +28,7 @@ class CreditFactory
$credit->terms = ''; $credit->terms = '';
$credit->public_notes = ''; $credit->public_notes = '';
$credit->private_notes = ''; $credit->private_notes = '';
$credit->date = null; $credit->date = now()->format('Y-m-d');
$credit->due_date = null; $credit->due_date = null;
$credit->partial_due_date = null; $credit->partial_due_date = null;
$credit->is_deleted = false; $credit->is_deleted = false;

2
app/Factory/InvoiceFactory.php
View File

@ -27,7 +27,7 @@ class InvoiceFactory
$invoice->terms = ''; $invoice->terms = '';
$invoice->public_notes = ''; $invoice->public_notes = '';
$invoice->private_notes = ''; $invoice->private_notes = '';
$invoice->date = null; $invoice->date = now()->format('Y-m-d');
$invoice->due_date = null; $invoice->due_date = null;
$invoice->partial_due_date = null; $invoice->partial_due_date = null;
$invoice->is_deleted = false; $invoice->is_deleted = false;

2
app/Factory/QuoteFactory.php
View File

@ -27,7 +27,7 @@ class QuoteFactory
$quote->terms = ''; $quote->terms = '';
$quote->public_notes = ''; $quote->public_notes = '';
$quote->private_notes = ''; $quote->private_notes = '';
$quote->date = null; $quote->date = now()->format('Y-m-d');
$quote->due_date = null; $quote->due_date = null;
$quote->partial_due_date = null; $quote->partial_due_date = null;
$quote->is_deleted = false; $quote->is_deleted = false;

2
app/Http/Controllers/ClientPortal/NinjaPlanController.php
View File

@ -134,7 +134,7 @@ class NinjaPlanController extends Controller
// $account = auth()->guard('contact')->user()->company->account; // $account = auth()->guard('contact')->user()->company->account;
if(auth()->guard('contact')->user()->client->custom_value2){ if(auth()->guard('contact')->user()->client->custom_value2){
MultiDB::findAndSetDbByAccountKey(auth()->guard('contact')->user()->client->custom_value2); MultiDB::findAndSetDbByAccountKey(auth()->guard('contact')->user()->client->custom_value2);
$account = Account::where('key', auth()->guard('contact')->user()->client->custom_value2); $account = Account::where('key', auth()->guard('contact')->user()->client->custom_value2)->first();
$account->trial_started = now(); $account->trial_started = now();
$account->trial_plan = 'pro'; $account->trial_plan = 'pro';
$account->save(); $account->save();

0
resources/views/email/migration/failed_text.blade → resources/views/email/migration/failed_text.blade.php
View File

9
resources/views/portal/ninja2020/gateways/stripe/acss/pay.blade.php
View File

@ -1,8 +1,15 @@
@extends('portal.ninja2020.layout.payments', ['gateway_title' => 'Pre-authorized debit payments', 'card_title' => 'Pre-authorized debit payments']) @extends('portal.ninja2020.layout.payments', ['gateway_title' => 'Pre-authorized debit payments', 'card_title' => 'Pre-authorized debit payments'])
@section('gateway_head') @section('gateway_head')
<meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
@if($gateway->company_gateway->getConfigField('account_id'))
<meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}"> <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
<meta name="stripe-publishable-key" content="{{ config('ninja.ninja_stripe_publishable_key') }}">
@else
<meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
@endif
<meta name="return-url" content="{{ $return_url }}"> <meta name="return-url" content="{{ $return_url }}">
<meta name="amount" content="{{ $stripe_amount }}"> <meta name="amount" content="{{ $stripe_amount }}">
<meta name="country" content="{{ $country }}"> <meta name="country" content="{{ $country }}">