KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server update

Browse Source
This commit is contained in:
e.arrahn
2021-05-27 17:09:21 +08:00
parent 1e84106df8 95a6d7ab4c
commit 0eba041c34
11 changed files with 256 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+2 -2
View File
@@ -2187,10 +2187,10 @@ class GadaiController extends Controller
case '1STOP':
$tarikhtawarruq = '2021-05-09';
break;
case '020301';
case '020301':
$tarikhtawarruq = '2021-05-18';
break;
case 'ALS':
case 'ALS':
$tarikhtawarruq = '2021-05-24';
break;
case 'WB':
app/Http/Controllers/LaporanController.php
+23 -1
View File
@@ -17,7 +17,7 @@ use App\Vault;
use App\Tunai;
use App\Denominasi;
use App\HapusKira;
use App\GlCode;
use Carbon\Carbon;
class LaporanController extends Controller
@@ -249,4 +249,26 @@ class LaporanController extends Controller
return response()->json($hapuskira);
}
public function CalcXtra($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$upahsimpan = GlCode::on($cawangan['mysql'])
->where('glcode','=','5000/413')
->sum('amaun');
$bakilelongxtra = GlCode::on($cawangan['mysql'])
->where('glcode','=','7000/190')
->sum('amaun');
$untungrugiterkumpul = GlCode::on($cawangan['mysql'])
->where('glcode','=','7000/201')
->sum('amaun');
$arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul)];
return response()->json($arrayxtra);
}
}
app/Http/Controllers/LelongController.php
+13
View File
@@ -10,6 +10,7 @@ use App\WTD;
use App\GlCode;
use App\imbangdugalama;
use App\AnsRugi;
use App\SerahBaki;
use Illuminate\Http\Request;
@@ -381,6 +382,18 @@ class LelongController extends Controller
return response()->json($wtd,200);
}
public function calculationserahbaki($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$serahbaki = SerahBaki::on($cawangan['mysql'])
->where('tarikh','<=', $request->tarikh)
->sum('baki');
return response()->json($serahbaki,200);
}
public function cajlelongcalculation($kodcaw,Request $request)
{
$current = Carbon::now();
app/Http/Controllers/TebusController.php
+92
View File
@@ -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();
app/Http/Controllers/TransaksiKeuntunganController.php
+6
View File
@@ -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();
app/Http/Controllers/VaultController.php
-1
View File
@@ -396,7 +396,6 @@ class VaultController extends Controller
$pindahkekpkb = GlCode::on($cawangan['mysql'])
->where('glcode','=',$serahankoperasi)
->orWhere('glcode','=',)
->sum('amaun');
$arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
app/SerahBaki.php
+42
View File
@@ -0,0 +1,42 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class SerahBaki extends Model
{
protected $table = 'serahbaki';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'norujukan',
'batchno',
'hargajual',
'pinjaman',
'upah',
'cajlel',
'gst_cl',
'gst_hj',
'baki',
'tarikh',
't_jual',
'nopelanggan',
'aktif'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
public $timestamps = false;
}
bootstrap/app.php
+2
View File
@@ -116,4 +116,6 @@ $app->middleware([
App\Http\Middleware\CorsMiddleware::class
]);
$app->register(\Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class);
return $app;
composer.json
+2 -1
View File
@@ -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",
composer.lock
Generated
+66 -2
View File
@@ -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"
}
routes/web.php
+8
View File
@@ -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']);
@@ -364,11 +370,13 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar
$router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong
$router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
$router->get('SerahBaki/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut
$router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
$router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
$router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
$router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
$router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
$router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira
//-- Untung Rugi --//