diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index 87e1a206319f..8fe542e71ab8 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -32,7 +32,7 @@ class Vendor extends BaseModel 'assigned_user_id', 'id_number', 'vat_number', - 'work_phone', + 'phone', 'address1', 'address2', 'city', diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php index e3278bd2b8ca..3dba3db520a9 100644 --- a/app/Transformers/ExpenseTransformer.php +++ b/app/Transformers/ExpenseTransformer.php @@ -78,8 +78,8 @@ class ExpenseTransformer extends EntityTransformer 'public_notes' => (string) $expense->public_notes ?: '', 'transaction_reference' => (string) $expense->transaction_reference ?: '', 'transaction_id' => (string) $expense->transaction_id ?: '', - //'date' => $expense->date ?: '', - 'expense_date' => $expense->date ?: '', + 'date' => $expense->date ?: '', + //'expense_date' => $expense->date ?: '', 'number' => (string)$expense->number ?: '', 'payment_date' => $expense->payment_date ?: '', 'custom_value1' => $expense->custom_value1 ?: '', diff --git a/database/migrations/2020_10_29_001541_vendors_phone_column.php b/database/migrations/2020_10_29_001541_vendors_phone_column.php new file mode 100644 index 000000000000..f1cec4e9a616 --- /dev/null +++ b/database/migrations/2020_10_29_001541_vendors_phone_column.php @@ -0,0 +1,30 @@ +renameColumn('work_phone', 'phone'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}