From 07fb064b6e0d9b62af771191833b76ecfd3a9f7f Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 1 Nov 2022 22:45:14 +0800
Subject: [PATCH] fix untuk push

---
 app/Http/Controllers/AkaunController.php | 7 +++++--
 resources/js/app.js                      | 6 +++---
 resources/js/components/Cawangan.vue     | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php
index c6df4bd..d52f8cc 100644
--- a/app/Http/Controllers/AkaunController.php
+++ b/app/Http/Controllers/AkaunController.php
@@ -11,6 +11,7 @@ use Barryvdh\DomPDF\Facade as PDF;
 use Maatwebsite\Excel\Excel;
 
 use App\Models\Lejeram;
+use App\Models\Cawangan;
 
 
 class AkaunController extends Controller
@@ -1022,7 +1023,9 @@ class AkaunController extends Controller
         $keun_sebenar = Http::get($request->hostname.'/admin/ig/keuntungansebenar',['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json();
         $pend_terakru = Http::get($request->hostname.'/admin/ig/pendapatanterakru',['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json();
         $keun_penggadai = Http::get($request->hostname.'/api/KeuntunganPenggadai/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json();
-                
+        
+        $caw_penyelarasan = Cawangan::select('penyelarasan')->where('kodcaw',$request->kodcaw)->get()->toArray();
+        
         //TunaiDitangan Sementara Upah
         if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
         {
@@ -1105,7 +1108,7 @@ class AkaunController extends Controller
         if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
         if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
         if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
-        array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Penyelarasan','amaun' => 154612.13]);
+        if($caw_penyelarasan[0]['penyelarasan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Penyelarasan','amaun' => $caw_penyelarasan[0]['penyelarasan']]);
 
         
         $totaltanggungansemasa = 0;
diff --git a/resources/js/app.js b/resources/js/app.js
index 32b4ad3..1667dbd 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -126,18 +126,18 @@ Vue.use(require('vue-pusher'), {
     }
 });
 
-Vue.prototype.$api1 = 'http://localhost:8000/'
+Vue.prototype.$api1 = 'http://api.arrahn/'
 Vue.prototype.$username = document.querySelector("meta[name='user_name']").getAttribute('content');
 Vue.prototype.$userroles = document.querySelector("meta[name='user_roles']").getAttribute('content');
 
 
 let initial = 'KB2';
-let initialhostname = 'http://localhost:8000/';
+let initialhostname = 'http://api.arrahn/';
 
 const store = new Vuex.Store({
     state: { 
         $kodcaw: 'KB2',
-        $hostname: 'http://localhost:8000/' 
+        $hostname: 'http://api.arrahn/' 
     },
     plugins: [createPersistedState()],
     mutations: { 
diff --git a/resources/js/components/Cawangan.vue b/resources/js/components/Cawangan.vue
index 5511518..bd55359 100644
--- a/resources/js/components/Cawangan.vue
+++ b/resources/js/components/Cawangan.vue
@@ -84,7 +84,7 @@
                     case 'JLI':
                     case 'ARP':
                     case '020303':{
-                        this.sethostname('http://localhost:8000')
+                        this.sethostname('http://api.arrahn')
                         break;
                     }
                     case '010621':
@@ -114,7 +114,7 @@
                         this.sethostname('http://api3.arrahn')
                         break;
                     }
-                    default: this.sethostname('http://localhost:8000')
+                    default: this.sethostname('http://api.arrahn')
                              break;
                 }
             }