auto tawarruq
This commit is contained in:
@@ -384,6 +384,98 @@ class TebusController extends Controller
|
||||
return response()->json($update_gadai, 201);
|
||||
}
|
||||
|
||||
public function tebusUpdateAutoTawarruq($kodcaw,$norujukan,Request $request){
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
if($request->jenisbayarantebus == "tawarruq")
|
||||
{
|
||||
$rebet = $this->rebetselepastawarruq($kodcaw,$norujukan);
|
||||
}
|
||||
else if($request->jenisbayarantebus == "nottawarruq")
|
||||
{
|
||||
$rebet = $this->rebet($kodcaw,$norujukan);
|
||||
}
|
||||
else{
|
||||
$rebet = 0;
|
||||
}
|
||||
|
||||
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
|
||||
|
||||
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
|
||||
'sttebus' => "T",
|
||||
't_update' => $current->toDateString(),
|
||||
));
|
||||
|
||||
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
|
||||
|
||||
$create_tebus = Tebus::on($cawangan['mysql'])->create([
|
||||
'kodcaw'=> $kodcaw,
|
||||
'norujukan'=> $norujukan,
|
||||
'nopelanggan' => $request->nopelanggan,
|
||||
'jenisbyr' => "TN",
|
||||
'jenistebus' => $request->jenistebus,
|
||||
'glcode' => "0",
|
||||
't_tebus' => $current->toDateString(),
|
||||
'jbg' => $request->jbg,
|
||||
'kadarupah' => $request->kadarupah,
|
||||
'nilaimarhun' => $request->nilai_marhun,
|
||||
'pinjaman' => $request->pinjaman,
|
||||
'ansuran' => $request->ansuran,
|
||||
'addpinjaman' => $request->addpinjaman,
|
||||
'bakipjm' => $request->bakipinjaman,
|
||||
'bakiupah' => $request->bakiupah,
|
||||
'terima' => "*",
|
||||
'kodgl' => "0",
|
||||
'nowakil' => $request->nowakil,
|
||||
'rebate' => $rebet,
|
||||
'marhuntebus' => $request->marhun,
|
||||
'historygadaian' => $request->historygadaian,
|
||||
'tarikhbyrn' => $current->toDateString(),
|
||||
'teller' => $request->teller
|
||||
]);
|
||||
|
||||
$create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
|
||||
'tarikh' => $current->toDateString(),
|
||||
'masa' => $current->toTimeString(),
|
||||
'norujukan' => $norujukan,
|
||||
'nm' => $request->nilai_marhun,
|
||||
'pkd' => $request->teller,
|
||||
'drp' => $request->teller,
|
||||
'bln' => $current->month,
|
||||
'thn' => $current->year,
|
||||
'tag' => 0,
|
||||
'jenistebus' => $request->jenistebus,
|
||||
'namateller' => $request->teller
|
||||
]);
|
||||
|
||||
$bayaran_pembiayaan = $request->totalbayaran - $request->bakiupah;
|
||||
|
||||
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
|
||||
'norujukan' => $norujukan,
|
||||
'bayaran_keuntungan' => $request->bakiupah,
|
||||
'bayaran_pembiayaan' => $bayaran_pembiayaan,
|
||||
'keuntungan_rebet' => 0,
|
||||
'tarikh_bayaran'=> $current,
|
||||
'kodcaw'=> $kodcaw
|
||||
]);
|
||||
|
||||
$transaction = Transaction::on('mysql7')->create([
|
||||
'trans_type' => $request->jenistebus,
|
||||
'norujukan' => $norujukan,
|
||||
'nokp' => $gadai['nokp'],
|
||||
'teller' => $request->teller,
|
||||
'kodcaw' => $kodcaw,
|
||||
'duit_masuk' => $request->totalbayaran,
|
||||
'created_at' => $current,
|
||||
'bakiharga' => 0,
|
||||
]);
|
||||
|
||||
return response()->json($update_gadai, 201);
|
||||
}
|
||||
|
||||
public function getLaporanTebus($kodcaw,$tarikh){
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
|
||||
@@ -15,6 +15,12 @@ class TransaksiKeuntunganController extends Controller
|
||||
return response()->json($transaksi);
|
||||
}
|
||||
|
||||
public function getTransaksiKeuntunganByRujukanLatest($norujukan){
|
||||
$transaksi = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id','desc')->first();
|
||||
|
||||
return response()->json($transaksi);
|
||||
}
|
||||
|
||||
public function getLatestTransaksi_Untung($norujukan) //added byy fariz 20210413
|
||||
{
|
||||
$transaksi = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id','desc')->limit(1)->get();
|
||||
|
||||
@@ -116,4 +116,6 @@ $app->middleware([
|
||||
App\Http\Middleware\CorsMiddleware::class
|
||||
]);
|
||||
|
||||
$app->register(\Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class);
|
||||
|
||||
return $app;
|
||||
|
||||
+2
-1
@@ -7,7 +7,8 @@
|
||||
"require": {
|
||||
"php": "^7.2.5",
|
||||
"auth0/auth0-php": "^7.4",
|
||||
"laravel/lumen-framework": "^7.0"
|
||||
"laravel/lumen-framework": "^7.0",
|
||||
"rap2hpoutre/laravel-log-viewer": "^1.7"
|
||||
},
|
||||
"require-dev": {
|
||||
"fzaninotto/faker": "^1.9.1",
|
||||
|
||||
Generated
+66
-2
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "474d8ea1131290fe83e6823cbaea5a52",
|
||||
"content-hash": "f3fc95d4bf94ca7763a98f60d5a6fd91",
|
||||
"packages": [
|
||||
{
|
||||
"name": "auth0/auth0-php",
|
||||
@@ -2702,6 +2702,69 @@
|
||||
],
|
||||
"time": "2020-08-18T17:17:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "rap2hpoutre/laravel-log-viewer",
|
||||
"version": "v1.7.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/rap2hpoutre/laravel-log-viewer.git",
|
||||
"reference": "27392d29234b6ff38a456454558f4bcc40cc837a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/rap2hpoutre/laravel-log-viewer/zipball/27392d29234b6ff38a456454558f4bcc40cc837a",
|
||||
"reference": "27392d29234b6ff38a456454558f4bcc40cc837a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/support": "4.2.*|5.*|^6.0|^7.0|^8.0",
|
||||
"php": ">=5.4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"orchestra/testbench": "3.7.*",
|
||||
"phpunit/phpunit": "^7"
|
||||
},
|
||||
"type": "laravel-package",
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"Rap2hpoutre\\LaravelLogViewer\\LaravelLogViewerServiceProvider"
|
||||
]
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"src/controllers"
|
||||
],
|
||||
"psr-0": {
|
||||
"Rap2hpoutre\\LaravelLogViewer\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "rap2hpoutre",
|
||||
"email": "raphaelht@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A Laravel log reader",
|
||||
"keywords": [
|
||||
"laravel",
|
||||
"log",
|
||||
"log-reader",
|
||||
"log-viewer",
|
||||
"logging",
|
||||
"lumen"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/rap2hpoutre/laravel-log-viewer/issues",
|
||||
"source": "https://github.com/rap2hpoutre/laravel-log-viewer/tree/master"
|
||||
},
|
||||
"time": "2020-09-08T12:21:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v5.2.6",
|
||||
@@ -5973,5 +6036,6 @@
|
||||
"platform": {
|
||||
"php": "^7.2.5"
|
||||
},
|
||||
"platform-dev": []
|
||||
"platform-dev": [],
|
||||
"plugin-api-version": "2.0.0"
|
||||
}
|
||||
|
||||
@@ -18,6 +18,10 @@ $router->get('/', function () use ($router) {
|
||||
// return \Illuminate\Support\Str::random(32);
|
||||
// });
|
||||
|
||||
$router->group(['namespace' => '\Rap2hpoutre\LaravelLogViewer'], function() use ($router) {
|
||||
$router->get('logs', 'LogViewerController@index');
|
||||
});
|
||||
|
||||
$router->group(['prefix'=>'api'], function () use ($router){
|
||||
//Customer API
|
||||
$router->get('customers',['uses'=>'CustomerController@showAllCustomers']);
|
||||
@@ -91,6 +95,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
//Maintenance API TEBUS
|
||||
// $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
|
||||
$router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);
|
||||
$router->put('updateautotawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdateAutoTawarruq']);
|
||||
$router->get('listpenebusanhistory/{kodcaw}',['uses'=>'TebusController@listhistorypenebusan']);
|
||||
|
||||
//API FARIS
|
||||
@@ -165,6 +170,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
$router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']);
|
||||
|
||||
$router->get('transaksi_keuntungan/{norujukan}',['uses'=>'TransaksiKeuntunganController@getTransaksiKeuntunganByRujukan']);
|
||||
$router->get('transaksi_keuntungan_latest/{norujukan}',['uses'=>'TransaksiKeuntunganController@getTransaksiKeuntunganByRujukanLatest']);
|
||||
$router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']);
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user