Merge branch 'farisv2' into 'master'

Farisv2

See merge request online-sistem1/api_arrahn!82

app/Http/Controllers/TransaksiKeuntunganController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
 
 use App\TransaksiKeuntungan;
 use Illuminate\Http\Request;
+use Carbon\Carbon;
+use DB;
 
 class TransaksiKeuntunganController extends Controller
 {
@@ -33,7 +35,7 @@ class TransaksiKeuntunganController extends Controller
     public function createTransaksiKeuntungan(Request $request){
         $transaksi = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $request->norujukan,
-            'bayaran_keuntungan' => $request->bayaran_keuntungan,
+            'bayaran_keuntungan' =>$request->bayaran_keuntungan,
             'tarikh_bayaran'=> $request->tarikh_bayaran,
             'tempoh'=> $request->tempoh,
             'kodcaw'=> $request->kodcaw

config/database.php

@@ -42,7 +42,6 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
-
         ],
 
         'mysql4' => [
@@ -96,7 +95,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql8' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_8'),
@@ -112,7 +110,7 @@ return [
         'mysql9' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_9'),
-            'port'      => env('DB_PORT'),
+            'port'      => env('DB_PORT_9'),
             'database'  => env('DB_DATABASE_9'),
             'username'  => env('DB_USERNAME_9'),
             'password'  => env('DB_PASSWORD_9'),
@@ -121,7 +119,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql10' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_10'),
@@ -134,7 +131,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql11' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_11'),
@@ -147,6 +143,8 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
+
         'mysql12' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_12'),
@@ -159,6 +157,8 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
+
         'mysql13' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_13'),
@@ -387,6 +387,8 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
+
         'mysql32' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_32'),
@@ -411,5 +413,9 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
+
+
     ],
-];
+];
+

routes/web.php

@@ -164,6 +164,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']);
 
 
+    $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  // new added 20210413
+    $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  // new added  20210413
+
+
     //OTP API
     $router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
     $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);