Skip to content
This repository was archived by the owner on Mar 23, 2021. It is now read-only.

Commit 3509cda

Browse files
iamn9iamn9
committed
Merge branch 'fixes'
2 parents ebe3714 + afb72c0 commit 3509cda

23 files changed

+601
-438
lines changed

‎app/Accountability.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ public function getOwner(){
2222
}
2323

2424
public function getOwnerID(){
25-
return Cart::findOrFail($this->cart_id)->value('borrower_id');
25+
return DB::table('carts')->where('id',$this->cart_id)->value('borrower_id');
2626
}
2727

2828
public function getItemName(){
29-
return Item::findOrFail($this->item_id)->value('name');
29+
return DB::table('items')->where('id',$this->item_id)->value('name');
3030
}
3131
}

‎app/Cart_item.php

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,34 @@ class Cart_item extends Model
1212
protected $table = 'cart_items';
1313

1414
public function getFee(){
15-
$item_id = $this->item_id;
16-
$firsthour = Item::where('id', '=', $item_id)->value('firsthour');
17-
if($firsthour == 0){
18-
return $firsthour;
19-
}
20-
$released_at = Transaction::where('cart_id','=',$this->cart_id)->value('released_at');
21-
if($released_at == NULL)
22-
return 0.00;
23-
24-
$completed_at = Transaction::where('cart_id','=',$this->cart_id)->value('completed_at');
25-
if($completed_at == NULL)
26-
$completed_at = date("Y-m-d H:i:s");
27-
28-
$diff = date_diff( date_create($released_at), date_create($completed_at), true);
29-
$elapsed_hours = $diff->h + $diff->d*24 + $diff->m*24*30 + $diff->y*24*30*12;
30-
31-
$succeeding_hours = Item::where('id', '=', $item_id)->value('succeeding');
32-
$total_fee = $succeeding_hours*$elapsed_hours + $firsthour;
33-
return number_format($total_fee, 2);
15+
16+
$trans_id = DB::table('transactions')->where('cart_id',$this->cart_id)->value('id');
17+
$item_amt = DB::table('accountabilities')->where('trans_id',$trans_id)->where('item_id', $this->item_id)->value('amount');
18+
if ($item_amt != null)
19+
$fee = $item_amt;
20+
else{
21+
$item_id = $this->item_id;
22+
$firsthour = Item::where('id', '=', $item_id)->value('firsthour');
23+
if($firsthour == 0){
24+
return $firsthour;
25+
}
26+
$released_at = Transaction::where('cart_id','=',$this->cart_id)->value('released_at');
27+
if($released_at == NULL)
28+
return 0.00;
29+
30+
$completed_at = Transaction::where('cart_id','=',$this->cart_id)->value('completed_at');
31+
if($completed_at == NULL)
32+
$completed_at = date("Y-m-d H:i:s");
33+
34+
$diff = date_diff( date_create($released_at), date_create($completed_at), true);
35+
$elapsed_hours = $diff->h + $diff->d*24 + $diff->m*24*30 + $diff->y*24*30*12;
36+
37+
$succeeding_hours = Item::where('id', '=', $item_id)->value('succeeding');
38+
$fee = $succeeding_hours*$elapsed_hours + $firsthour;
39+
}
40+
return number_format($fee, 2);
41+
42+
3443
}
3544

3645
public function getTotalFee(){

‎app/Http/Controllers/HomeController.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
use Illuminate\Http\Request;
66
use Illuminate\Support\Facades\Auth;
77
use Illuminate\Support\Facades\DB;
8-
use App\Transaction;
9-
use App\Cart;
10-
use App\User;
11-
use App\News;
128

139
class HomeController extends Controller
1410
{
@@ -29,8 +25,7 @@ public function __construct()
2925
*/
3026
public function index()
3127
{
32-
$news = News::join('users', function ($join) {
33-
$join->on('news.reporter_id', '=', 'users.id_no');})->select('news.content', 'users.name','news.date_posted')->orderBy('news.date_posted','desc')->get();
28+
$news = \App\News::orderBy('news.date_posted','desc')->limit(5)->get();
3429
if (Auth::user()->isAdmin){
3530
$count_unactivatedUsers = DB::table('users')->where('isActivated','0')->count();
3631
$count_newOrders = DB::table('carts')->where('status','Pending')->count();
@@ -44,7 +39,7 @@ public function index()
4439
$count_pendingCarts = DB::table('carts')->where('borrower_id',$cur_user)->where('status','Pending')->count();
4540
$count_unreturnedCarts = DB::table('carts')->where('borrower_id',$cur_user)->where('status','Released')->count();
4641
$count_readyCarts = DB::table('carts')->where('borrower_id',$cur_user)->where('status','Prepared')->count();
47-
$transactions = DB::table('transactions')->join('carts','transactions.cart_id' ,'=', 'carts.id')->join('users','carts.borrower_id','=','users.id_no')->where('users.id_no','=', $cur_user)->limit(5)->get();
42+
$transactions = DB::table('transactions')->join('carts','transactions.cart_id' ,'=', 'carts.id')->join('users','carts.borrower_id','=','users.id_no')->where('users.id_no','=', $cur_user)->orderBy('transactions.submitted_at', 'desc')->limit(5)->get();
4843
return view('user_dashboard', compact('transactions','news','count_pendingCarts','count_unreturnedCarts','count_readyCarts'));
4944
}
5045
}

‎app/Http/Controllers/ItemController.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Validator;
66
use Illuminate\Support\Facades\App;
77
use Illuminate\Support\Facades\Auth;
8-
use Illuminate\Support\Facades\Input;
98
use Illuminate\Http\Request;
109
use App\Http\Controllers\Controller;
1110
use App\Item;
@@ -22,7 +21,6 @@ public function index()
2221
{
2322
$title = 'Item Index';
2423

25-
2624
$items = Item::all();
2725
if (Auth::check() && Auth::user()->isAdmin)
2826
return view('item.index', compact('items', 'title'));
@@ -107,12 +105,7 @@ public function show($id, Request $request)
107105
public function showModal($id, Request $request)
108106
{
109107
$item = Item::findOrfail($id);
110-
// $msg = Ajaxis::BtDisplay("Item Info",
111-
// [
112-
// ['key' => 'ID', 'value' => $item->id],
113-
// ['key' => 'Name', 'value' => $item->name],
114-
// ['key' => 'Description', 'value' => $item->description],
115-
// ]);
108+
116109
if ($request->ajax()) {
117110
return $msg;
118111
}

‎app/Http/Controllers/ListingController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function show($id, Request $request)
111111
->join('items', 'listing_items.item_id', '=', 'items.id')
112112
->select('listing_items.*', 'items.name')
113113
->where('listing_id', $listing->id)
114-
->orderBy('items.name')-get();
114+
->orderBy('items.name')->get();
115115

116116
if (Auth::user()->isAdmin) {
117117
return view('listing.show', compact('searchWord', 'title', 'listing', 'listing_items'));

‎app/Http/Controllers/TransactionController.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,16 +205,12 @@ public function confirm_complete($id, Request $request)
205205
$userid = Cart::where('id', '=', $transaction->cart_id)->value('borrower_id');
206206
$user = User::where('id_no', '=', $userid)->first();
207207

208-
$carts = Cart::select('transactions.id as trans_id', 'cart_id', 'carts.id', 'remarks', 'submitted_at', 'prepared_at', 'completed_at', 'released_at', 'borrower_id', 'status')->join('transactions', function ($join) {
209-
$join->on('carts.id', '=', 'transactions.cart_id');
210-
})->where('borrower_id', '=', $userid)
211-
->where('transactions.id', '=', $transaction->id)->get();
212-
208+
$cart = Cart::findOrFail($transaction->cart_id);
213209
$cart_items = \App\Cart_item::where('cart_id',$transaction->cart_id)->get();
214210

215211
$nameAdmin = Auth::user()->name;
216212

217-
return view('transaction.confirm_complete', compact('title', 'carts', 'cart_items', 'user', 'date', 'nameAdmin'));
213+
return view('transaction.confirm_complete', compact('title', 'transaction', 'cart', 'cart_items', 'user', 'date', 'nameAdmin'));
218214
}
219215

220216
public function user_history_info($id, Request $Request)

‎app/News.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public function getID(){
1717
public function getreporter_id(){
1818
return $this->reporter_id;
1919
}
20-
20+
public function getReporterName(){
21+
return \App\User::where('id_no', $this->reporter_id)->value('name');
22+
}
2123

2224
}

‎resources/views/accountability/admin_index.blade.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,26 @@
88
</div>
99
<div class="box-body">
1010
<table class = "dataTable table table-striped table-bordered table-hover" style = 'background:#fff'>
11-
<thead>
12-
<th style="width: 30px">ID</th>
11+
<thead>
1312
<th style="width: 30px">TransID</th>
1413
<th>Name</th>
1514
<th style="width: 30px">ItemID</th>
15+
<th>QTY</th>
1616
<th>Date Incurred</th>
1717
<th>Date Paid</th>
18-
<th>Amount</th>
19-
<th>Qty</th>
18+
<th>Fees</th>
19+
2020
</thead>
2121
<tbody>
2222
@foreach($accountabilities as $accountability)
2323
<tr id='{!!$accountability->id!!}'>
24-
<td>{!!$accountability->id!!}</td>
2524
<td><a href="/transaction/{!!$accountability->trans_id!!}">{!!$accountability->trans_id!!}</a></td>
26-
<td>{!!$accountability->getOwner()!!}</td>
25+
<td>{!!$accountability->getOwner()!!}</td>
2726
<td><a href="/item/{!!$accountability->item_id!!}">{!!$accountability->item_id!!}</a></td>
27+
<td>{!!$accountability->qty!!}</td>
2828
<td>{!!$accountability->date_incurred!!}</td>
2929
<td>{!!$accountability->date_paid!!}</td>
3030
<td>{!!$accountability->amount!!}</td>
31-
<td>{!!$accountability->qty!!}</td>
3231
</tr>
3332
@endforeach
3433
</tbody>

‎resources/views/accountability/index_completed.blade.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,22 @@
99
</div>
1010
<div class="box-body">
1111
<table class = "dataTable table table-striped table-bordered table-hover" style = 'background:#fff'>
12-
<thead>
13-
<th style="width: 30px">ID</th>
12+
<thead>
1413
<th style="width: 30px">TransID</th>
1514
<th>Name</th>
1615
<th style="width: 30px">ItemID</th>
17-
<th style="width: 30px">QTY</th>
18-
<th>Date Incurred</th>
16+
<th style="width: 30px">QTY</th>
1917
<th>Date Paid</th>
2018
<th>Amount</th>
2119
<th>Actions</th>
2220
</thead>
2321
<tbody>
2422
@foreach($accountabilities as $accountability)
2523
<tr id='{!!$accountability->id!!}'>
26-
<td>{!!$accountability->id!!}</td>
2724
<td><a href="transaction/{!!$accountability->trans_id!!}">{!!$accountability->trans_id!!}</a></td>
2825
<td>{!!$accountability->getOwner()!!}</td>
2926
<td><a href="item/{!!$accountability->item_id!!}">{!!$accountability->item_id!!}</a></td>
30-
<td>{!!$accountability->qty!!}</td>
31-
<td>{!!$accountability->date_incurred!!}</td>
27+
<td>{!!$accountability->qty!!}</td>
3228
<td>{!!$accountability->date_paid!!}</td>
3329
<td>{!!$accountability->amount!!}</td>
3430
<td>

‎resources/views/accountability/index_pending.blade.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
</div>
1010
<div class="box-body">
1111
<table class = "dataTable table table-striped table-bordered table-hover" style = 'background:#fff'>
12-
<thead>
13-
<th style="width: 30px">ID</th>
12+
<thead>
1413
<th style="width: 30px">TransID</th>
1514
<th>Name</th>
1615
<th style="width: 30px">ItemID</th>
@@ -22,7 +21,6 @@
2221
<tbody>
2322
@foreach($accountabilities as $accountability)
2423
<tr id='{!!$accountability->id!!}'>
25-
<td>{!!$accountability->id!!}</td>
2624
<td><a href="/transaction/{!!$accountability->trans_id!!}">{!!$accountability->trans_id!!}</a></td>
2725
<td>{!!$accountability->getOwner()!!}</td>
2826
<td><a href="/item/{!!$accountability->item_id!!}">{!!$accountability->item_id!!}</a></td>
@@ -31,7 +29,7 @@
3129
<td>{!!$accountability->amount!!}</td>
3230
<td>
3331
<a data-toggle="tooltip" title="Remove Accountability" class = 'delete btn btn-danger xs' data-link = "/accountability/{!!$accountability->id!!}/deleteMsg" ><i class="fa fa-trash-o" aria-hidden="true"></i></a>
34-
<a data-toggle="tooltip" title="Item paid" class = 'update btn btn-success xs' href = '/accountability/{!!$accountability->id!!}/payItem'><i class="fa fa-check" aria-hidden="true"></i> Paid</a>
32+
<a data-toggle="tooltip" title="Paid Fees, Replaced, or Returned" class = 'update btn btn-success xs' href = '/accountability/{!!$accountability->id!!}/payItem'><i class="fa fa-check" aria-hidden="true"></i> Paid</a>
3533
</td>
3634
</tr>
3735
@endforeach

0 commit comments

Comments
 (0)