diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 98e9466..e20e1fe 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Audit; use App\Komuditi; use App\KomuditiPurchase; use App\KomuditiTransaksi; @@ -41,7 +42,6 @@ class KomuditiController extends Controller public function beliKomuditi(Request $request){ $current = Carbon::now(); - $current = new Carbon(); $komuditi_purchase = KomuditiPurchase::on('mysql7')->create([ 'unit_komuditi' => $request->unit_komuditi, @@ -64,12 +64,20 @@ class KomuditiController extends Controller 'harga'=> $request->nilai ]); + $audit = new Audit(); + $audit->users = $request->purchased_by; + $audit->actions = "pembelian komuditi"; + $audit->new_data = $komuditi_purchase; + $audit->kodcaw = $request->kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response()->json($komuditi_purchase); } public function jualKomuditi(Request $request){ $current = Carbon::now(); - $current = new Carbon(); $komuditi_asal = KomuditiPurchase::on('mysql7')->where('no_sijil','=',$request->nosijil)->latest()->first(); @@ -86,6 +94,15 @@ class KomuditiController extends Controller 'harga'=> $komuditi_asal['nilai'] ]); + $audit = new Audit(); + $audit->users = $request->purchased_by; + $audit->actions = "penjualan komuditi"; + $audit->new_data = $komuditi_asal; + $audit->kodcaw = $request->kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response()->json('berjaya'); } @@ -134,7 +151,7 @@ class KomuditiController extends Controller $update_komuditi = KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([ 'unit_komuditi' => $update_unit ]); - + $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->create([ 'unit_komuditi' => $request->unit_komuditi, 'nosijil'=>$komuditi_current['no_sijil'], @@ -175,7 +192,7 @@ class KomuditiController extends Controller public function getKomuditiProductUnit(Request $request){ $produk = KomuditiProduk::on('mysql7')->where('kodproduk','=',$request->kodproduk)->first(); - + return response()->json($produk['unit']); } @@ -198,7 +215,7 @@ class KomuditiController extends Controller $current = Carbon::now(); $current = new Carbon(); $komoditi = []; - + $jumlahkomoditi = Komuditi::on('mysql7')->where([['date_purchase','=',$current->toDateString()], ['transaction_type', '=', 'Beli Komoditi']])->orderBy('created_at','desc')->first(); $transaksi_komoditi = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first(); @@ -209,8 +226,8 @@ class KomuditiController extends Controller $percentage_baki_komoditi = ($baki_komoditi/$jumlahkomoditi['unit_komuditi'])*100; array_push($komoditi, - ['komoditi_transaksi'=>number_format($transaksi_komoditi['unit_komuditi'],2), - 'baki_komoditi'=>number_format($baki_komoditi,2), + ['komoditi_transaksi'=>number_format($transaksi_komoditi['unit_komuditi'],2), + 'baki_komoditi'=>number_format($baki_komoditi,2), 'percentage_komoditi_transaksi'=>number_format($percentage_komoditi_transaksi,1), 'percentage_baki_komoditi'=>number_format($percentage_baki_komoditi,1)]); @@ -232,7 +249,7 @@ class KomuditiController extends Controller $monthly_array = new Carbon(); $yearly_array = Carbon::now(); $yearly_array = new Carbon(); - + $array_totalup = []; if($request->method == 'daily'){ @@ -279,13 +296,13 @@ class KomuditiController extends Controller { $pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('date_purchase')->groupBy('date_purchase') ->where([['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$weekly_date]])->orderBy('created_at','desc')->get(); - + }elseif($request->method == 'monthly') { $pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql')->raw('DATE_FORMAT(date_purchase, "%Y-%m") as date_purchase')) ->groupBy(DB::connection('mysql')->raw("DATE_FORMAT(date_purchase,'%Y%m')"))->where([['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$monthly_date]]) ->orderBy('created_at','desc')->get(); - + }elseif($request->method == 'yearly') { $pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql')->raw('DATE_FORMAT(date_purchase, "%Y") as date_purchase')) @@ -303,7 +320,7 @@ class KomuditiController extends Controller } } } - + } @@ -318,4 +335,4 @@ class KomuditiController extends Controller return response()->json($rekodkomoditi); } -} \ No newline at end of file +}