diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 914f7efb..939fe894 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -376,7 +376,7 @@ class AccountController extends Controller ->groupBy('lelongbidder.payment_id') ->get(); // $payments = Payment::whereIn($saggroupbyid)->get() - $total_payment = Payment::whereIn('id',$saggroupbyid)->get()->sum('total_payment'); + $total_payment = Payment::whereIn('id',$saggroupbyid)->sum('total_payment'); $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id') ->where('payment.lelong_id', $lelong_id) diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index 8507df94..2ade905f 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -49,8 +49,9 @@ class CartController extends Controller $carts[$index]['datalelongbid']['cawangan'] = $cawangan; } - - return response()->json($carts); + return response()->json([ + "carts" => $carts + ]); } public function getCartByCawangan($userId) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 406364cc..b8d94992 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -271,7 +271,6 @@ class HomeController extends Controller ->distinct() ->get() ->toArray(); - dd($lelong); foreach($lelong as $info) { diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 981023d0..206cc3dc 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1969,7 +1969,6 @@ class LelongController extends Controller $resit->reference_no = $reference_no; $resit->billplz_id = ''; $resit->total_payment = $sumhargabida->sum('hargabida'); - dd($sumhargabida->sum('hargabida')); $resit->resit_type = 2; // 1 = fee , 2 = bid $resit->save(); } diff --git a/app/Http/Controllers/LogoutController.php b/app/Http/Controllers/LogoutController.php index 1c308502..572d8b9b 100644 --- a/app/Http/Controllers/LogoutController.php +++ b/app/Http/Controllers/LogoutController.php @@ -36,6 +36,6 @@ class LogoutController extends Controller */ public function logout(Request $request) { Auth::logout(); - return redirect('/login'); + return redirect()->route('login'); } } diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index f9974244..b301840b 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -419,7 +419,6 @@ class LelongMobileController extends Controller ->where('caw_id', '=', $request->caw_id) ->where('status_online', '=', 1) ->get()->toArray(); - dd($lelong); foreach($lelong as $index1 => $lel) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index d52710bb..426431fe 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -401,7 +401,6 @@ class PaymentController extends Controller $updatepayment = FileResit::where('payment_id', $getpayment['payment_id']) ->where('id', $getpayment['fileresit_id']) ->first(); - $updatepayment->id; $updatepayment->user_id = $request->user_id; $updatepayment->payment_id = $updatepayment->payment_id; $updatepayment->file_type = $file_type; diff --git a/app/Models/Cart.php b/app/Models/Cart.php index 5d7fbd02..a2181370 100644 --- a/app/Models/Cart.php +++ b/app/Models/Cart.php @@ -12,8 +12,6 @@ class Cart extends Model protected $table = 'carts'; protected $fillable = [ - 'user_id', - 'lelongbid_id', 'hargabida' ]; diff --git a/app/Models/CawanganLelong.php b/app/Models/CawanganLelong.php index 51ec8493..8fd3c486 100644 --- a/app/Models/CawanganLelong.php +++ b/app/Models/CawanganLelong.php @@ -13,8 +13,6 @@ class CawanganLelong extends Model protected $fillable = [ 'batchlel', - 'lelong_id', - 'caw_id', 'status_online', 'masamula_lelong', 'masatamat_lelong', diff --git a/app/Models/CawanganSimulasi.php b/app/Models/CawanganSimulasi.php index c81265de..add9079f 100644 --- a/app/Models/CawanganSimulasi.php +++ b/app/Models/CawanganSimulasi.php @@ -12,8 +12,6 @@ class CawanganSimulasi extends Model protected $table = 'cawangan_simulasi'; protected $fillable = [ - 'simulasi_id', - 'caw_id', 'online', 'export_data_sts', 'import_data_sts', diff --git a/app/Models/File.php b/app/Models/File.php index 068f0c73..515739f5 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -12,7 +12,6 @@ class File extends Model protected $table = 'file'; protected $fillable = [ - 'user_id', 'file_type', 'filename', 'deleted_at', diff --git a/app/Models/FileResit.php b/app/Models/FileResit.php index f1d85b00..31e5a576 100644 --- a/app/Models/FileResit.php +++ b/app/Models/FileResit.php @@ -12,8 +12,6 @@ class FileResit extends Model protected $table = 'fileresit'; protected $fillable = [ - 'user_id', - 'payment_id', 'file_type', 'filename', 'deleted_at', diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 990e92a5..ec1462b2 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -12,8 +12,6 @@ class Invoice extends Model protected $table = 'invoice'; protected $fillable = [ - 'user_id', - 'lelong_id', 'invoice_no', 'total_invoice', 'invoice_type', // 1 = fee , 2 = bid diff --git a/resources/views/auth/change-password.blade.php b/resources/views/auth/change-password.blade.php index 011bfbc1..0659b7da 100644 --- a/resources/views/auth/change-password.blade.php +++ b/resources/views/auth/change-password.blade.php @@ -73,7 +73,7 @@ -