diff --git a/app/Transformers/Banking/Account.php b/app/Transformers/Banking/Account.php index 5c8e2f7a6..d485a0503 100644 --- a/app/Transformers/Banking/Account.php +++ b/app/Transformers/Banking/Account.php @@ -20,9 +20,9 @@ class Account extends TransformerAbstract 'number' => $model->number, 'currency_code' => $model->currency_code, 'opening_balance' => $model->opening_balance, - 'opening_balance_format' => money($model->opening_balance, $model->currency_code, true)->format(), + 'opening_balance_formatted' => money($model->opening_balance, $model->currency_code, true)->format(), 'current_balance' => $model->balance, - 'current_balance_format' => money($model->balance, $model->currency_code, true)->format(), + 'current_balance_formatted' => money($model->balance, $model->currency_code, true)->format(), 'bank_name' => $model->bank_name, 'bank_phone' => $model->bank_phone, 'bank_address' => $model->bank_address, diff --git a/app/Transformers/Banking/Reconciliation.php b/app/Transformers/Banking/Reconciliation.php index 1829cd625..887a6d1ec 100644 --- a/app/Transformers/Banking/Reconciliation.php +++ b/app/Transformers/Banking/Reconciliation.php @@ -25,7 +25,7 @@ class Reconciliation extends TransformerAbstract 'started_at' => $model->started_at->toIso8601String(), 'ended_at' => $model->ended_at->toIso8601String(), 'closing_balance' => $model->closing_balance, - 'closing_balance_format' => money($model->closing_balance, setting('default.currency'), true)->format(), + 'closing_balance_formatted' => money($model->closing_balance, setting('default.currency'), true)->format(), 'reconciled' => $model->reconciled, 'created_by' => $model->created_by, 'created_at' => $model->created_at->toIso8601String(), diff --git a/app/Transformers/Banking/Transaction.php b/app/Transformers/Banking/Transaction.php index f5a80c849..d1c33d21c 100644 --- a/app/Transformers/Banking/Transaction.php +++ b/app/Transformers/Banking/Transaction.php @@ -28,7 +28,7 @@ class Transaction extends TransformerAbstract 'account_id' => $model->account_id, 'paid_at' => $model->paid_at->toIso8601String(), 'amount' => $model->amount, - 'amount_format' => money($model->amount, $model->currency_code, true)->format(), + 'amount_formatted' => money($model->amount, $model->currency_code, true)->format(), 'currency_code' => $model->currency_code, 'currency_rate' => $model->currency_rate, 'document_id' => $model->document_id, diff --git a/app/Transformers/Banking/Transfer.php b/app/Transformers/Banking/Transfer.php index 9d11a85be..d9d771008 100644 --- a/app/Transformers/Banking/Transfer.php +++ b/app/Transformers/Banking/Transfer.php @@ -29,7 +29,7 @@ class Transfer extends TransformerAbstract 'to_account' => $income_transaction->account->name, 'to_account_id' => $income_transaction->account->id, 'amount' => $expense_transaction->amount, - 'amount_format' => money($expense_transaction->amount, $expense_transaction->currency_code, true)->format(), + 'amount_formatted' => money($expense_transaction->amount, $expense_transaction->currency_code, true)->format(), 'currency_code' => $expense_transaction->currency_code, 'paid_at' => $expense_transaction->paid_at ? $expense_transaction->paid_at->toIso8601String() : '', 'created_by' => $model->created_by, diff --git a/app/Transformers/Common/Item.php b/app/Transformers/Common/Item.php index c5b49e8dd..68846c053 100644 --- a/app/Transformers/Common/Item.php +++ b/app/Transformers/Common/Item.php @@ -25,9 +25,9 @@ class Item extends TransformerAbstract 'name' => $model->name, 'description' => $model->description, 'sale_price' => $model->sale_price, - 'sale_price_format' => money($model->sale_price, setting('default.currency'), true)->format(), + 'sale_price_formatted' => money($model->sale_price, setting('default.currency'), true)->format(), 'purchase_price' => $model->purchase_price, - 'purchase_price_format' => money($model->purchase_price, setting('default.currency'), true)->format(), + 'purchase_price_formatted' => money($model->purchase_price, setting('default.currency'), true)->format(), 'category_id' => $model->category_id, 'tax_ids' => $model->tax_ids, 'picture' => $model->picture, diff --git a/app/Transformers/Document/Document.php b/app/Transformers/Document/Document.php index 070463a03..8b57ac83b 100644 --- a/app/Transformers/Document/Document.php +++ b/app/Transformers/Document/Document.php @@ -31,7 +31,7 @@ class Document extends TransformerAbstract 'issued_at' => $model->issued_at ? $model->issued_at->toIso8601String() : '', 'due_at' => $model->due_at ? $model->due_at->toIso8601String() : '', 'amount' => $model->amount, - 'amount_format' => money($model->amount, $model->currency_code, true)->format(), + 'amount_formatted' => money($model->amount, $model->currency_code, true)->format(), 'currency_code' => $model->currency_code, 'currency_rate' => $model->currency_rate, 'contact_id' => $model->contact_id, diff --git a/app/Transformers/Document/DocumentItem.php b/app/Transformers/Document/DocumentItem.php index 1635951b9..60beb328d 100644 --- a/app/Transformers/Document/DocumentItem.php +++ b/app/Transformers/Document/DocumentItem.php @@ -21,9 +21,9 @@ class DocumentItem extends TransformerAbstract 'item_id' => $model->item_id, 'name' => $model->name, 'price' => $model->price, - 'price_format' => money($model->price, $model->document->currency_code, true)->format(), + 'price_formatted' => money($model->price, $model->document->currency_code, true)->format(), 'total' => $model->total, - 'total_format' => money($model->total, $model->document->currency_code, true)->format(), + 'total_formatted' => money($model->total, $model->document->currency_code, true)->format(), 'tax' => $model->tax, 'tax_id' => $model->tax_id, 'created_at' => $model->created_at ? $model->created_at->toIso8601String() : '', diff --git a/app/Transformers/Document/DocumentItemTax.php b/app/Transformers/Document/DocumentItemTax.php index 305007adb..9b8c41e68 100644 --- a/app/Transformers/Document/DocumentItemTax.php +++ b/app/Transformers/Document/DocumentItemTax.php @@ -28,7 +28,7 @@ class DocumentItemTax extends TransformerAbstract 'tax_id' => $model->tax_id, 'name' => $model->name, 'amount' => $model->amount, - 'amount_format' => money($model->amount, $model->document->currency_code, true)->format(), + 'amount_formatted' => money($model->amount, $model->document->currency_code, true)->format(), 'created_at' => $model->created_at ? $model->created_at->toIso8601String() : '', 'updated_at' => $model->updated_at ? $model->updated_at->toIso8601String() : '', ]; diff --git a/app/Transformers/Document/DocumentTotal.php b/app/Transformers/Document/DocumentTotal.php index aa0214fad..1c370e20c 100644 --- a/app/Transformers/Document/DocumentTotal.php +++ b/app/Transformers/Document/DocumentTotal.php @@ -22,7 +22,7 @@ class DocumentTotal extends TransformerAbstract 'code' => $model->code, 'name' => $model->name, 'amount' => $model->amount, - 'amount_format' => money($model->amount, $model->document->currency_code, true)->format(), + 'amount_formatted' => money($model->amount, $model->document->currency_code, true)->format(), 'sort_order' => $model->sort_order, 'created_at' => $model->created_at ? $model->created_at->toIso8601String() : '', 'updated_at' => $model->updated_at ? $model->updated_at->toIso8601String() : '',