Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2018-07-08 14:01:01 +03:00
parent 6ccfbe869b
commit 239f492311
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Console/Commands/CalculatePayouts.php
View File

@ -83,14 +83,17 @@ class CalculatePayouts extends Command
foreach ($companies as $company) { foreach ($companies as $company) {
$user = $userMap[$company->referral_code]; $user = $userMap[$company->referral_code];
$payment = $company->payment; $payment = $company->payment;
$client = $payment->client;
$this->info("User: $user"); if ($payment) {
$this->info("Client: " . $client->getDisplayName()); $client = $payment->client;
foreach ($client->payments as $payment) { $this->info("User: $user");
$amount = $payment->getCompletedAmount(); $this->info("Client: " . $client->getDisplayName());
$this->info("Date: $payment->payment_date, Amount: $amount, Reference: $payment->transaction_reference");
foreach ($client->payments as $payment) {
$amount = $payment->getCompletedAmount();
$this->info("Date: $payment->payment_date, Amount: $amount, Reference: $payment->transaction_reference");
}
} }
} }
} }

1
resources/lang/en/texts.php
View File

@ -2849,6 +2849,7 @@ $LANG = array(
'all_invoices' => 'All Invoices', 'all_invoices' => 'All Invoices',
'my_invoices' => 'My Invoices', 'my_invoices' => 'My Invoices',
'mobile_refresh_warning' => 'If you\'re using the mobile app you may need to do a full refresh.', 'mobile_refresh_warning' => 'If you\'re using the mobile app you may need to do a full refresh.',
'enable_proposals_for_background' => 'To upload a background image :link to enable the proposals module.',
); );

3
resources/views/accounts/client_portal.blade.php
View File

@ -513,7 +513,8 @@ iframe.src = '{{ rtrim(SITE_URL ,'/') }}/' + parts[1] + '/' + parts[0].substring
$('#domainHelp, #iframeModalHelp, #domainModalHelp').hide(); $('#domainHelp, #iframeModalHelp, #domainModalHelp').hide();
$('#is_custom_domain').val(0); $('#is_custom_domain').val(0);
var val = $('input[name=custom_link]:checked').val() var val = $('input[name=custom_link]:checked').val() || 'iframe';
if (val == 'subdomain') { if (val == 'subdomain') {
$('.subdomain').show(); $('.subdomain').show();
} else if (val == 'iframe') { } else if (val == 'iframe') {

6
resources/views/accounts/invoice_design.blade.php
View File

@ -298,7 +298,11 @@
->label('background_image') ->label('background_image')
->addOption('', '') ->addOption('', '')
->fromQuery(\App\Models\Document::scope()->proposalImages()->get(), function($model) { return $model->name . ' - ' . Utils::formatNumber($model->size / 1000, null, 1) . ' KB'; }, 'public_id') ->fromQuery(\App\Models\Document::scope()->proposalImages()->get(), function($model) { return $model->name . ' - ' . Utils::formatNumber($model->size / 1000, null, 1) . ' KB'; }, 'public_id')
->help(trans('texts.background_image_help', ['link' => link_to('/proposals/create?show_assets=true', trans('texts.proposal_editor'), ['target' => '_blank'])])) !!} ->help($account->isModuleEnabled(ENTITY_PROPOSAL)
? trans('texts.background_image_help', ['link' => link_to('/proposals/create?show_assets=true', trans('texts.proposal_editor'), ['target' => '_blank'])])
//: trans('texts.enable_proposals_for_background', ['link' => link_to('/settings/account_management', trans('texts.click_here'), ['target' => '_blank'])])
: 'To upload a background image <a href="http://www.ninja.test/settings/account_management" target="_blank">click here</a> to enable the proposals module.'
) !!}
@endif @endif
{!! Former::checkbox('hide_paid_to_date')->text(trans('texts.hide_paid_to_date_help'))->value(1) !!} {!! Former::checkbox('hide_paid_to_date')->text(trans('texts.hide_paid_to_date_help'))->value(1) !!}