Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-08-11 15:34:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
David Bomba 2016-03-13 19:34:54 +11:00
commit ddf5fa8938
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Listeners/SubscriptionListener.php
View File

@ -72,10 +72,6 @@ class SubscriptionListener
$manager->parseIncludes($include); $manager->parseIncludes($include);
$resource = new Item($entity, $transformer, $entity->getEntityType()); $resource = new Item($entity, $transformer, $entity->getEntityType());
$data = $manager->createData($resource)->toArray(); $data = $manager->createData($resource)->toArray();
// For legacy Zapier support
if (isset($data['client_id'])) {
$data['client_name'] = $entity->client->getDisplayName();
}
Utils::notifyZapier($subscription, $data); Utils::notifyZapier($subscription, $data);
} }
} }

3
app/Services/InvoiceService.php
View File

@ -79,7 +79,8 @@ class InvoiceService extends BaseService
public function approveQuote($quote, $invitation = null) public function approveQuote($quote, $invitation = null)
{ {
$account = Auth::user()->account; $account = $quote->account;
if (!$quote->is_quote || $quote->quote_invoice_id) { if (!$quote->is_quote || $quote->quote_invoice_id) {
return null; return null;
} }

2
resources/lang/de/texts.php
View File

@ -1121,7 +1121,7 @@ return array(
'all_pages_header' => 'Show header on', 'all_pages_header' => 'Show header on',
'all_pages_footer' => 'Show footer on', 'all_pages_footer' => 'Show footer on',
'invoice_currency' => 'Rechnungs-Währung', 'invoice_currency' => 'Rechnungs-Währung',
'enable_https' => 'Wir empfehlen dringend HTTPS zu verwendne, um Kreditkarten online zu akzeptieren.', 'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.',
'quote_issued_to' => 'Quote issued to', 'quote_issued_to' => 'Quote issued to',
'show_currency_code' => 'Währungscode', 'show_currency_code' => 'Währungscode',
'trial_message' => 'Your account will receive a free two week trial of our pro plan.', 'trial_message' => 'Your account will receive a free two week trial of our pro plan.',