Minor fixes

README.md

@@ -9,7 +9,9 @@
 
 ## [Hosted](https://www.invoiceninja.com) | [Self-Hosted](https://www.invoiceninja.org)
 
-### We're on Slack, join us at [slack.invoiceninja.com](http://slack.invoiceninja.com)
+### We're on Slack, join us at [slack.invoiceninja.com](http://slack.invoiceninja.com) or if you like [StackOverflow](https://stackoverflow.com/tags/invoice-ninja/)
+
+Just make sure to add the `invoice-ninja` tag to your question.
 
 All Pro and Enterprise features from the hosted app are included in the open-source code. We offer a $30 per year white-label license to remove our branding for personal use.
 
@@ -49,6 +51,7 @@ The self-host zip includes all third party libraries whereas downloading the cod
 * [Event Scheduler](https://github.com/cytech/Scheduler-InvoiceNinja)
 * [Manufacturer Module](https://github.com/dicarlosystems/manufacturer-invoiceninja)
 * [Point of Sale](https://github.com/dicarlosystems/pointofsale-invoiceninja)
+* [Invoice Design Import/Export](https://github.com/feyst/invoicedesignexport)
 
 > Feel free to email us for help if you're working on a module, we're happy to provide developer support.
 

app/Console/Commands/SendRecurringInvoices.php

@@ -81,8 +81,8 @@ class SendRecurringInvoices extends Command
         $invoices = Invoice::with('account.timezone', 'invoice_items', 'client', 'user')
             ->whereRaw('is_deleted IS FALSE AND deleted_at IS NULL AND is_recurring IS TRUE AND is_public IS TRUE AND frequency_id > 0 AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', [$today, $today])
             ->orderBy('id', 'asc')
-            ->get();
-        $this->info(date('r ') . $invoices->count() . ' recurring invoice(s) found');
+            ->cursor();
+        $this->info(date('r ') . ' Recurring invoice(s) found');
 
         foreach ($invoices as $recurInvoice) {
             $shouldSendToday = $recurInvoice->shouldSendToday();

app/Http/Controllers/AccountApiController.php

@@ -298,8 +298,8 @@ class AccountApiController extends BaseAPIController
         $timestamp = $request->timestamp;
         $productId = $request->product_id;
 
-        if (Carbon::createFromTimestamp($timestamp) < Carbon::now()->subYear()) {
-            return '{"message":"The order is expired"}';
+        if ($company->app_store_order_id) {
+            return '{"message":"error"}';
         }
 
         if ($productId == 'v1_pro_yearly') {
@@ -328,7 +328,7 @@ class AccountApiController extends BaseAPIController
         $company->plan_term = PLAN_TERM_YEARLY;
         $company->plan_started = $company->plan_started ?: date('Y-m-d');
         $company->plan_paid = date('Y-m-d');
-        $company->plan_expires = Carbon::createFromTimestamp($timestamp)->addYear()->format('Y-m-d');
+        $company->plan_expires = Carbon::now()->addYear()->format('Y-m-d');
         $company->trial_plan = null;
         $company->save();
 

app/Models/Expense.php

@@ -157,7 +157,7 @@ class Expense extends EntityModel
      */
     public function recurring_expense()
     {
-        return $this->belongsTo('App\Models\RecurringExpense');
+        return $this->belongsTo('App\Models\RecurringExpense')->withTrashed();
     }
 
 

resources/views/accounts/client_portal.blade.php

@@ -402,7 +402,10 @@ iframe.src = '{{ rtrim(SITE_URL ,'/') }}/' + parts[1] + '/' + parts[0].substring
             </div>
 
             <div class="panel-body" id="domainModalHelp" style="display:none">
-                <p>Create a DNS A Record entry for your custom domain and point to the following IP address <code>96.126.107.105</code>.</p>
+                <p>
+                    Create a DNS A Record entry for your custom domain and point to the following IP address <code>96.126.107.105</code>.
+                    You can watch this <a href="https://www.youtube.com/watch?v=tmEJI-Xfdb0" target="_blank">video on YouTube</a> to see how.
+                </p>
                 <p>Once this is setup please send an email to {{ env('CONTACT_EMAIL') }} and we'll complete the process.</p>
             </div>
 

resources/views/header.blade.php

@@ -354,7 +354,7 @@
 
       </div>
 
-      {!! Former::open('/handle_command')->id('search-form')->addClass('navbar-form navbar-right')->role('search') !!}
+      {!! Former::open(env('SPEECH_ENABLED') ? '/handle_command' : '/#')->id('search-form')->addClass('navbar-form navbar-right')->role('search') !!}
         <div class="form-group has-feedback">
           <input type="text" name="command" id="search" style="width: 280px;padding-top:0px;padding-bottom:0px;margin-right:12px;"
             class="form-control" placeholder="{{ trans('texts.search') . ': ' . trans('texts.search_hotkey')}}"/>
@@ -547,7 +547,9 @@
 
 @include('partials.contact_us')
 @include('partials.sign_up')
-@include('partials.keyboard_shortcuts')
+@if (!request()->is('*proposals*'))
+    @include('partials.keyboard_shortcuts')
+@endif
 
 @if (auth()->check() && auth()->user()->registered && ! auth()->user()->hasAcceptedLatestTerms())
     @include('partials.accept_terms')

resources/views/partials/variables_help.blade.php

@@ -61,7 +61,7 @@
         <li>$client.state</li>
         <li>$client.postalCode</li>
         <li>$client.country.name</li>
-        <li>$client.phone</li>
+        <li>$client.workPhone</li>
         <li>$client.balance</li>
         @if ($account->customLabel('client1'))
             <li>$client.customValue1</li>