From 957f6830d7fa24c49324785372360499adcb9989 Mon Sep 17 00:00:00 2001 From: afiq Date: Tue, 16 Feb 2021 14:57:29 +0800 Subject: [PATCH] komoditi --- .DS_Store | Bin 0 -> 8196 bytes app/HistoryEmasSandaran.php | 26 ++++++++++++ app/Http/Controllers/GadaiController.php | 2 - app/Http/Controllers/HargaEmasController.php | 39 ++++++++++++----- app/Http/Controllers/KomuditiController.php | 42 ++++++++++++++++++- app/Komuditi.php | 2 +- app/KomuditiPurchase.php | 2 +- routes/web.php | 2 + 8 files changed, 99 insertions(+), 16 deletions(-) create mode 100644 .DS_Store create mode 100644 app/HistoryEmasSandaran.php diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dc4cb3dedf3afcabaa5fbd569b28a279aed5d653 GIT binary patch literal 8196 zcmeHM%WfP+6uo6T;~pF1wqwUefHY!+6e(6@had|f#4vG$hKFoCRLM zSVd(z#b7#jV2Y0Mn#OmPRdixsUlzWu6b(a5|+m6CCTU`8u4GoW6D2-aym^C&rcDuRHkD8g2b<(<% zY>T5cC);)P2u<#c&@aiOxjc>V0GY|XvC^iJc>!O6YTFVDXEUd7Gyvx6qp z@p=0LJRM%>9qRDdFTL>owC!Gi<+1S>CSIJhr=~AX%}mYCUYeVqeQEmTS9a}-uH)Tp zC1R^Lc*K)>)CqR&$rQmiJRYwl!65?O%!1>r8Q#Otbb+uQ_@6!O+Bj(gGxM-RPWpZl z1o3t&3H{Z*y)?)+`}{4jnwRh>TH|S$g*@Kck*jCHK_lMdSW)a?wJnCyTS1b-4sbTN zoFsALR!~2=9XW0gt;ThpW&B_>L=-`f@xr)OefMuAV!2wotUQ~lJzcA{uaBi~ z*=!@`aRAhs8m!hn)F_Lt(0kOR9r}X0^ez2JKhv-DJN-rf(tS3;F0t3x6}G_MWXr6^ z8teo15&ML#vu(v6>YdY9^?ceeAC5k!hs`98c-%sdK#$^bPbj01Qh0IUvi}K){>#2h zE^+*2Kxg3LR>?EiT!Aq`9`Faar8qbNI9KU&c)Yk4`{q9|Bk(-BTUhg-0<$F7jA;*1 zwenaJH}ZFVH?l=OqR3EPRP3;T7Yg*_#}UasYKLOXo*|lJL>J{*QiXn2NitlD!0`%L z5qCefOzU(LSHTK>40{!``vr!GH_u3*tkARreLdml86s+C^+jC*PN1_#U=eW+JBpbz zpvBp474;F3=Fk_^oM;Ps5a&0CEYTrWkD)*2&hM8Y!Wn_?7rk_rr~$>&A>fAjIb z|3Aqsn7NGtMuDfS02^6puGF!K-nUe7KO)zzpx!|hMc}&1N(vg8j>F1y9QOPlhVUzZ d3QkSiuCnMs`Tu_i82nZ+?|*qJO!FKm@BnR7!BPMK literal 0 HcmV?d00001 diff --git a/app/HistoryEmasSandaran.php b/app/HistoryEmasSandaran.php new file mode 100644 index 0000000..df915f8 --- /dev/null +++ b/app/HistoryEmasSandaran.php @@ -0,0 +1,26 @@ +json($array_percentage); - } public function percentTop5(){ diff --git a/app/Http/Controllers/HargaEmasController.php b/app/Http/Controllers/HargaEmasController.php index 8568f2f..69d0fb3 100644 --- a/app/Http/Controllers/HargaEmasController.php +++ b/app/Http/Controllers/HargaEmasController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\HargaEmas; +use App\HistoryEmasSandaran; use Illuminate\Http\Request; @@ -37,12 +38,16 @@ class HargaEmasController extends Controller $harini = Carbon::now(); $harini = new Carbon; - $hargaemas=HargaEmas::on('mysql7') - ->where('recno','=',$request->recno) - ->update(array( - 'harga'=> $request->harga, - 'tarikhupdate' => $harini->toDateString() - )); + $emas_asal = HargaEmas::on('mysql7')->where('recno','=',$request->recno)->first(); + + $hargaemas=HargaEmas::on('mysql7')->where('recno','=',$request->recno)->update(array('harga'=> $request->harga,'tarikhupdate' => $harini->toDateString())); + + $history_emas = HistoryEmasSandaran::on('mysql7')->create([ + 'karat' => $emas_asal['karat'], + 't_efektif' => $harini->toDateString(), + 'm_efektif' => $harini->toTimeString(), + 'harga' => $request->harga + ]); return response()->json($hargaemas, 200); } @@ -52,16 +57,28 @@ class HargaEmasController extends Controller $harini = Carbon::now(); $harini = new Carbon; - $hargaemas=HargaEmas::on('mysql7') - ->create([ + $karat_db = HargaEmas::on('mysql7')->where('karat','=',$request->karat)->count(); + + if($karat_db == 0){ + $hargaemas=HargaEmas::on('mysql7')->create([ 'karat' => $request->karat, 'keterangan'=> $request->keterangan, 'harga' => $request->harga, 'harga2' => $request->harga2, 'tarikhupdate' => $harini->toDateString() - ]); - if($hargaemas){ - return response()->json(1, 201); + ]); + + $history_emas = HistoryEmasSandaran::on('mysql7')->create([ + 'karat' => $request->karat, + 't_efektif' => $harini->toDateString(), + 'm_efektif' => $harini->toTimeString(), + 'harga' => $request->harga + ]); + if($hargaemas){ + return response()->json(1, 201); + }else{ + return response()->json("unsuccess", 201); + } }else{ return response()->json("unsuccess", 201); } diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 22320e1..98a0f63 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -39,12 +39,52 @@ class KomuditiController extends Controller 'no_sijil' => $request->nosijil, 'kodproduct' => $request->kodproduct, 'purchased_by' => $request->purchased_by, - 'date_purchase' => $current->toDateString() + 'date_purchase' => $current->toDateString(), + 'time_purchase' => $current->toTimeString() + ]); + + $komuditi_history= Komuditi::on('mysql7')->create([ + 'unit_komuditi' => $request->unit_komuditi, + 'transaction_by' => $request->purchased_by, + 'date_purchase' => $current->toDateString(), + 'transaction_type' => 'Beli Komoditi', + 'time_purchase' => $current->toTimeString(), + 'nosijil' => $request->nosijil, + 'kodproduk' => $request->kodproduct, + 'harga'=> $request->nilai ]); 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)->first(); + + $komuditi_purchase = KomuditiPurchase::on('mysql7')->where('no_sijil','=',$request->nosijil)->update(['unit_komuditi' => 0]); + + $komuditi_history= Komuditi::on('mysql7')->create([ + 'unit_komuditi' => $komuditi_asal['unit_komuditi'], + 'transaction_by' => $request->purchased_by, + 'date_purchase' => $current->toDateString(), + 'transaction_type' => 'Jual Komoditi', + 'time_purchase' => $current->toTimeString(), + 'nosijil' => $request->nosijil, + 'kodproduk' => $komuditi_asal['kodproduct'], + 'harga'=> $komuditi_asal['nilai'] + ]); + + return response()->json($komuditi_purchase); + } + + public function rekodKomuditi(){ + $rekodkomuditi = Komuditi::on('mysql7')->orderBy('date_purchase','desc')->orderBy('time_purchase','desc')->get(); + + return response()->json($rekodkomuditi); + } + public function updateKomuditi(Request $request){ $current = Carbon::now(); $current = new Carbon(); diff --git a/app/Komuditi.php b/app/Komuditi.php index a16fa04..ddd53d5 100644 --- a/app/Komuditi.php +++ b/app/Komuditi.php @@ -14,7 +14,7 @@ class Komuditi extends Model * @var array */ protected $fillable = [ - 'unit_komuditi','purchased_by','date_purchase' + 'unit_komuditi','transaction_by','date_purchase','transaction_type','time_purchase','nosijil','harga','kodproduk' ]; /** diff --git a/app/KomuditiPurchase.php b/app/KomuditiPurchase.php index bf6f7ba..f0ed919 100644 --- a/app/KomuditiPurchase.php +++ b/app/KomuditiPurchase.php @@ -14,7 +14,7 @@ class KomuditiPurchase extends Model * @var array */ protected $fillable = [ - 'unit_komuditi','purchased_by','date_purchase','nilai','no_sijil','kodproduct' + 'unit_komuditi','purchased_by','date_purchase','nilai','no_sijil','kodproduct','time_purchase' ]; /** diff --git a/routes/web.php b/routes/web.php index b4a564e..8a3b78e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -253,6 +253,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Komuditi Pukal $router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']); $router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']); + $router->post('komuditi/jual',['uses'=>'KomuditiController@jualKomuditi']); $router->put('komuditi/update',['uses'=>'KomuditiController@updateKomuditi']); $router->put('komuditi/transaksi',['uses'=>'KomuditiController@transaksiKomuditi']); $router->put('komuditi/batal',['uses'=>'KomuditiController@batalKomuditi']); @@ -261,6 +262,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('komuditi/unit',['uses'=>'KomuditiController@getKomuditiProductUnit']); $router->get('komuditi/description',['uses'=>'KomuditiController@getKomuditiProductDescription']); $router->get('komuditi/rekodharian',['uses'=>'KomuditiController@rekodTransaksiHarian']); + $router->get('komuditi/rekodkomuditi',['uses'=>'KomuditiController@rekodKomuditi']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){