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

Fixed issue with default currency not being used

Browse Source
This commit is contained in:
Hillel Coren 2015-04-02 09:58:23 +03:00
parent c4d20b252f
commit 1c0aa4ec8d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/PaymentController.php
View File

@ -542,7 +542,7 @@ class PaymentController extends \BaseController
} }
} }
$invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail(); $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail();
$invoice = $invitation->invoice; $invoice = $invitation->invoice;
$client = $invoice->client; $client = $invoice->client;
$account = $client->account; $account = $client->account;

5
app/models/Account.php
View File

@ -54,6 +54,11 @@ class Account extends Eloquent
return $this->belongsTo('DatetimeFormat'); return $this->belongsTo('DatetimeFormat');
} }
public function currency()
{
return $this->belongsTo('Currency');
}
public function size() public function size()
{ {
return $this->belongsTo('Size'); return $this->belongsTo('Size');