mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for PhantomJS displaying Recurring Invoice
This commit is contained in:
parent
65ee07b8ec
commit
dc231bc8b5
@ -53,7 +53,7 @@ class Phantom
|
|||||||
} elseif ($invitation instanceof QuoteInvitation) {
|
} elseif ($invitation instanceof QuoteInvitation) {
|
||||||
$entity = 'quote';
|
$entity = 'quote';
|
||||||
$entity_design_id = 'quote_design_id';
|
$entity_design_id = 'quote_design_id';
|
||||||
} elseif ($inviation instanceof RecurringInvoiceInvitation) {
|
} elseif ($invitation instanceof RecurringInvoiceInvitation) {
|
||||||
$entity = 'recurring_invoice';
|
$entity = 'recurring_invoice';
|
||||||
$entity_design_id = 'invoice_design_id';
|
$entity_design_id = 'invoice_design_id';
|
||||||
}
|
}
|
||||||
@ -155,6 +155,10 @@ class Phantom
|
|||||||
App::setLocale($invitation->contact->preferredLocale());
|
App::setLocale($invitation->contact->preferredLocale());
|
||||||
|
|
||||||
$entity_design_id = $entity . '_design_id';
|
$entity_design_id = $entity . '_design_id';
|
||||||
|
|
||||||
|
if($entity == 'recurring_invoice')
|
||||||
|
$entity_design_id = 'invoice_design_id';
|
||||||
|
|
||||||
$design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity_design_id));
|
$design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity_design_id));
|
||||||
|
|
||||||
$design = Design::find($design_id);
|
$design = Design::find($design_id);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user