This commit is contained in:
afiq
2021-02-16 14:57:29 +08:00
parent 626fab209c
commit 957f6830d7
8 changed files with 99 additions and 16 deletions
Vendored
BIN
View File
Binary file not shown.
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class HistoryEmasSandaran extends Model
{
protected $table = 'history_emas_sandaran';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'karat','t_efektif','m_efektif','harga'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
-2
View File
@@ -1352,9 +1352,7 @@ class GadaiController extends Controller
} }
} }
} }
return response()->json($array_percentage); return response()->json($array_percentage);
} }
public function percentTop5(){ public function percentTop5(){
+28 -11
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\HargaEmas; use App\HargaEmas;
use App\HistoryEmasSandaran;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -37,12 +38,16 @@ class HargaEmasController extends Controller
$harini = Carbon::now(); $harini = Carbon::now();
$harini = new Carbon; $harini = new Carbon;
$hargaemas=HargaEmas::on('mysql7') $emas_asal = HargaEmas::on('mysql7')->where('recno','=',$request->recno)->first();
->where('recno','=',$request->recno)
->update(array( $hargaemas=HargaEmas::on('mysql7')->where('recno','=',$request->recno)->update(array('harga'=> $request->harga,'tarikhupdate' => $harini->toDateString()));
'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); return response()->json($hargaemas, 200);
} }
@@ -52,16 +57,28 @@ class HargaEmasController extends Controller
$harini = Carbon::now(); $harini = Carbon::now();
$harini = new Carbon; $harini = new Carbon;
$hargaemas=HargaEmas::on('mysql7') $karat_db = HargaEmas::on('mysql7')->where('karat','=',$request->karat)->count();
->create([
if($karat_db == 0){
$hargaemas=HargaEmas::on('mysql7')->create([
'karat' => $request->karat, 'karat' => $request->karat,
'keterangan'=> $request->keterangan, 'keterangan'=> $request->keterangan,
'harga' => $request->harga, 'harga' => $request->harga,
'harga2' => $request->harga2, 'harga2' => $request->harga2,
'tarikhupdate' => $harini->toDateString() '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{ }else{
return response()->json("unsuccess", 201); return response()->json("unsuccess", 201);
} }
+41 -1
View File
@@ -39,12 +39,52 @@ class KomuditiController extends Controller
'no_sijil' => $request->nosijil, 'no_sijil' => $request->nosijil,
'kodproduct' => $request->kodproduct, 'kodproduct' => $request->kodproduct,
'purchased_by' => $request->purchased_by, '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); 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){ public function updateKomuditi(Request $request){
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
+1 -1
View File
@@ -14,7 +14,7 @@ class Komuditi extends Model
* @var array * @var array
*/ */
protected $fillable = [ protected $fillable = [
'unit_komuditi','purchased_by','date_purchase' 'unit_komuditi','transaction_by','date_purchase','transaction_type','time_purchase','nosijil','harga','kodproduk'
]; ];
/** /**
+1 -1
View File
@@ -14,7 +14,7 @@ class KomuditiPurchase extends Model
* @var array * @var array
*/ */
protected $fillable = [ protected $fillable = [
'unit_komuditi','purchased_by','date_purchase','nilai','no_sijil','kodproduct' 'unit_komuditi','purchased_by','date_purchase','nilai','no_sijil','kodproduct','time_purchase'
]; ];
/** /**
+2
View File
@@ -253,6 +253,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//Komuditi Pukal //Komuditi Pukal
$router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']); $router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']);
$router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']); $router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']);
$router->post('komuditi/jual',['uses'=>'KomuditiController@jualKomuditi']);
$router->put('komuditi/update',['uses'=>'KomuditiController@updateKomuditi']); $router->put('komuditi/update',['uses'=>'KomuditiController@updateKomuditi']);
$router->put('komuditi/transaksi',['uses'=>'KomuditiController@transaksiKomuditi']); $router->put('komuditi/transaksi',['uses'=>'KomuditiController@transaksiKomuditi']);
$router->put('komuditi/batal',['uses'=>'KomuditiController@batalKomuditi']); $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/unit',['uses'=>'KomuditiController@getKomuditiProductUnit']);
$router->get('komuditi/description',['uses'=>'KomuditiController@getKomuditiProductDescription']); $router->get('komuditi/description',['uses'=>'KomuditiController@getKomuditiProductDescription']);
$router->get('komuditi/rekodharian',['uses'=>'KomuditiController@rekodTransaksiHarian']); $router->get('komuditi/rekodharian',['uses'=>'KomuditiController@rekodTransaksiHarian']);
$router->get('komuditi/rekodkomuditi',['uses'=>'KomuditiController@rekodKomuditi']);
}); });
$router->group(['prefix'=>'e-arrahn'], function () use ($router){ $router->group(['prefix'=>'e-arrahn'], function () use ($router){