Skip to content

Commit

Permalink
Minor Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Hyleeh committed Nov 6, 2018
1 parent 2f4a3d1 commit 6cab737
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion app/Finance/Transaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Transaction extends Eloquent {
*
* @var array
*/
protected $sortableColumns = ['name', 'amount', 'created_at'];
protected $sortableColumns = ['created_at', 'name', 'amount'];

/**
* Scope for request filter
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/AccountsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function transactions(Request $request, $id)

if(empty($request->input('q')))
{
$transactions = $transactions->sortable()->paginate();
$transactions = $transactions->sortable(['created_at' => 'desc'])->paginate();
$isSearch = false;
} else {
$transactions = $transactions->search($request->input('q'), null, true)->get();
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/TagsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function transactions(Request $request, $id)

if(empty($request->input('q')))
{
$transactions = $transactions->sortable()->paginate();
$transactions = $transactions->sortable(['created_at' => 'desc'])->paginate();
$isSearch = false;
} else {
$transactions = $transactions->search($request->input('q'), null, true)->get();
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/TransactionsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function index(Request $request)
{
if(empty($request->input('q')))
{
$transactions = Transaction::sortable()->filteredByType()->paginate();
$transactions = Transaction::sortable(['created_at' => 'desc'])->filteredByType()->paginate();
$isSearch = false;
} else {
$transactions = Transaction::search($request->input('q'), null, true)->groupBy('id')->get();
Expand Down Expand Up @@ -70,7 +70,7 @@ public function deleteInvoice($id)
if($info = json_decode($transaction->invoice)) {
\Storage::delete('invoices/' . $info->store_name);
}

$transaction->update(['invoice' => null]);

$this->notify('transactions.deleted_invoice');
Expand Down
2 changes: 1 addition & 1 deletion app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class AppServiceProvider extends ServiceProvider
{

const VERSION = '1.0-alpha.1';
const VERSION = '1.0-alpha.2';

/**
* Bootstrap any application services.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "umomega/bookkeeper",
"description": "Laravel Powered Finance Tracker and CRM.",
"keywords": ["umomega", "bookkeeper", "finance", "crm", "multilingual", "laravel", "laravel5", "php", "php7", "finance-application", "bookkeeping", "finance-tracker"],
"version": "1.0-alpha.1",
"version": "1.0-alpha.2",
"license": "MIT",
"type": "project",
"authors": [
Expand Down

0 comments on commit 6cab737

Please sign in to comment.