From a2f06e8d5298691d878fc624baec22a096e5fba4 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Wed, 19 Jun 2024 11:53:44 +0800
Subject: [PATCH] added akrubulananpecahan dan imbangduga range untuk tallykan

---
 resources/js/Akaun/Home.vue                |   2 +-
 resources/js/ImbangDuga/index.vue          | 418 +++++++--------------
 resources/views/imbangduga/index.blade.php |   4 +-
 resources/views/layouts/sidebar.blade.php  |  30 +-
 4 files changed, 150 insertions(+), 304 deletions(-)

diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue
index bb2eddf..987dd8b 100644
--- a/resources/js/Akaun/Home.vue
+++ b/resources/js/Akaun/Home.vue
@@ -146,7 +146,7 @@
                 </router-link>
             </div>
             <div class="bg-white ml-2 shadow border border-solid px-6 py-4 rounded-lg hover:bg-yellow-300 hover:transition-all mb-2 cursor-pointer">
-                <router-link to="/akaunhome/akrubulanpecahan">
+                <router-link to="/akaunhome/akrubulan">
                     <h2 class="mx-auto text-center font-bold text-2xl uppercase">Akru Bulanan Pecahan</h2>
                 </router-link>
             </div>
diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue
index 4a0b5e7..b0d0801 100644
--- a/resources/js/ImbangDuga/index.vue
+++ b/resources/js/ImbangDuga/index.vue
@@ -1,323 +1,165 @@
 <template>
-    <div class="container">
-        <div class="flex w-full">
-            <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
-                <div
-                    class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg"
-                >
-                    <router-link to="/akaunhome">
+   <div class="container">
+
+            <div class="flex w-full">
+                <div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
+                <div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">       
+                   <router-link to="/akaunhome">
                         <i class="fas fa-backspace text-white"></i>
                     </router-link>
-                    <span class="text-center mx-auto text-white font-bold"
-                        >Imbang Duga</span
-                    >
+                    <span class="text-center mx-auto text-white font-bold">Imbang Duga</span>
                 </div>
-                <form
-                    method="get"
-                    id="formgadaian"
-                    :action="Urlredirect()"
-                    target="_blank"
-                >
+                    <form method="get" id="formgadaian" :action="Urlredirect()" target="_blank">
                     <div class="rounded bg-white shadow p-6">
                         <div class="pb-6">
-                            <label
-                                for="username"
-                                class="font-semibold text-gray-700 block pb-1"
-                                >Tarikh</label
-                            >
+                        <label for="username" class="font-semibold text-gray-700 block pb-1">Tarikh</label>
                             <div class="flex">
-                                <span
-                                    style="background-color: #f9fafb"
-                                    class="text-gray-600 border rounded-l px-4 py-2 whitespace-no-wrap"
-                                    >Mula</span
-                                >
-                                <input
-                                    id="tarikhmula"
-                                    name="datetarikh"
-                                    @change="dateChecking"
-                                    v-model="tarikhmula"
-                                    class="border border-l-0 rounded-r px-4 py-2 w-1/2 mr-2"
-                                    type="date"
-                                />
-                                <span
-                                    style="background-color: #f9fafb"
-                                    class="text-gray-600 border rounded-l px-4 py-2 whitespace-no-wrap"
-                                    >Hingga</span
-                                >
-                                <input
-                                    id="tarikhhingga"
-                                    name="datehingga"
-                                    v-model="tarikhhingga"
-                                    @change="dateChecking"
-                                    class="border border-l-0 rounded-r px-4 py-2 w-1/2 mr-2"
-                                    type="date"
-                                />
+                                <input :value="$kodcaw" name="kodcaw" hidden/>
+                                <input :value="$hostname" name="hostname" hidden/>
+                                <input :value="jenisgenerate" type="hidden" name="jenis" />
+                                <span style="background-color: #F9FAFB" class="text-gray-600 border rounded-l px-4 py-2 whitespace-no-wrap">Mula</span>
+                                <input id="tarikhmula" name="datetarikh" @change="dateChecking()" class="border border-l-0 rounded-r px-4 py-2 w-1/2 mr-2" type="date" />
+                                <span style="background-color: #F9FAFB" class="text-gray-600 border rounded-l px-4 py-2 whitespace-no-wrap">Hingga</span>
+                                <input id="tarikhhingga" name="datehingga" @change="dateChecking()" class="border border-l-0 rounded-r px-4 py-2 w-1/2 mr-2" type="date"/>
+
                             </div>
+                            
                             <div class="flex justify-end mt-5">
-                                <button
-                                    @click.prevent="getImbangDuga(1)"
-                                    class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"
-                                >
-                                    <i class="fas fa-eye mr-2"></i>Cari
-                                </button>
+                                <!-- <button @click.prevent="generatepdf"  class=" mr-2 border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-file-pdf mr-2"></i>PDF</button> -->
+                                <button @click.prevent="generateview" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-eye mr-2"></i>Cari</button>
                             </div>
-                        </div>
+                        </div> 
                     </div>
-                </form>
+                    </form>
+                </div>
             </div>
-        </div>
-        <div class="container mx-auto px-5 my-10">
-            <modal ref="modal"></modal>
-            <table class="min-w-full leading-normal">
-                <thead class="text-center">
-                    <tr>
-                        <th
-                            class="px-4 py-8 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        ></th>
-                        <th
-                            class="px-4 py-8 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        >
-                            Bil
-                        </th>
-                        <th
-                            class="px-4 py-6 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        >
-                            Tarikh
-                        </th>
-                        <th
-                            class="px-4 py-6 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        >
-                            Kod Caw
-                        </th>
-                        <th
-                            class="px-4 py-6 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        >
-                            Tanggungan Semasa
-                        </th>
-                        <th
-                            class="px-4 py-6 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        >
-                            Harta Semasa
-                        </th>
-                        <th
-                            class="px-4 py-6 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        >
-                            Tag Telly
-                        </th>
-                        <th
-                            class="px-10 py-6 border-b-2 border-gray-200 bg-gray-100 text-left text-sm font-semibold text-gray-600 uppercase tracking-wider"
-                        >
-                            Act
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr v-for="(imbangduga, i) in showimbangduga.data" :key="i">
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                         
-                        </td>
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                            <div class="flex items-center">
-                                <div class="ml-3">
-                                    <p
-                                        class="text-gray-900 whitespace-no-wrap"
-                                        v-text="showimbangduga.from + i"
-                                    ></p>
-                                </div>
-                            </div>
-                        </td>
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                            <div class="flex items-center">
-                                <div class="ml-3">
-                                    <p
-                                        class="text-gray-900 whitespace-no-wrap"
-                                        v-text="imbangduga.tarikh"
-                                    ></p>
-                                </div>
-                            </div>
-                        </td>
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                            <div class="flex items-center">
-                                <div class="ml-3">
-                                    <p
-                                        class="text-gray-900 whitespace-no-wrap"
-                                        v-text="imbangduga.kodcaw"
-                                    ></p>
-                                </div>
-                            </div>
-                        </td>
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                            <div class="flex items-center">
-                                <div class="ml-3">
-                                    <p
-                                        class="text-gray-900 whitespace-no-wrap"
-                                        v-text="
-                                            formatterfunction(
-                                                imbangduga.totaltanggungan
-                                            )
-                                        "
-                                    ></p>
-                                </div>
-                            </div>
-                        </td>
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                            <div class="flex items-center">
-                                <div class="ml-3">
-                                    <p
-                                        class="text-gray-900 whitespace-no-wrap"
-                                        v-text="
-                                            formatterfunction(
-                                                imbangduga.totalharta
-                                            )
-                                        "
-                                    ></p>
-                                </div>
-                            </div>
-                        </td>
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                            <div class="flex items-center">
-                                <div class="ml-3">
-                                    <span
-                                        :class="{
-                                            'bg-green-100 text-green-800 border-green-400 dark:text-green-400':
-                                                imbangduga.tagtally,
-                                        }"
-                                        class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400"
-                                        >&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</span
-                                    >
-                                </div>
-                            </div>
-                        </td>
-                        <td
-                            class="px-5 py-5 border-b border-gray-200 bg-white text-sm"
-                        >
-                            <button
-                                @click="action('2024', 'kb2')"
-                                class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-4 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"
-                            >
-                                <svg
-                                    xmlns="http://www.w3.org/2000/svg"
-                                    width="16"
-                                    height="16"
-                                    fill="currentColor"
-                                    class="bi bi-card-checklist"
-                                    viewBox="0 0 16 16"
-                                >
-                                    <path
-                                        d="M14.5 3a.5.5 0 0 1 .5.5v9a.5.5 0 0 1-.5.5h-13a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h13zm-13-1A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h13a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-13z"
-                                    />
-                                    <path
-                                        d="M7 5.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0zM7 9.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0z"
-                                    />
-                                </svg>
-                            </button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-            <pagination
-                :data="paginate"
-                @clickEvent_="getImbangDuga"
-            ></pagination>
-        </div>
     </div>
 </template>
 
 <script>
-import modal from "../components/util/ImbangdugaModal.vue";
-import pagination from "../components/pagination.vue";
-
-const formatter = new Intl.NumberFormat("en-US", {
-    minimumFractionDigits: 2,
-});
-
 export default {
-    components: {
-        pagination,
-        modal,
-    },
 
-    data() {
-        return {
-            tarikhmula: "",
-            tarikhhingga: "",
-
-            index: 0,
-            leftToRight: true,
-            imbangduga: [],
-            PaginationLimit: 2,
-            perPage: 5,
-            totalPage: 0,
-            currentPage: 1,
-            lastPage: 5,
-            showimbangduga: [],
-            paginate: {},
-            activePage: 1,
-            showLoader: false,
-        };
+    data(){
+        return{
+            jenisgenerate:'none',
+            kodcaw: ''
+        }
     },
     methods: {
-        Urlredirect: function () {
-            return window.route("cetak.gadaian");
-        },
+        async generatepdf(){
+            await this.setJenis('pdf');
 
-        dateChecking() {
             var tarikhMula = document.getElementById("tarikhmula");
             var tarikhHingga = document.getElementById("tarikhhingga");
-
+            
             var tarikh1 = new Date(tarikhMula.value);
             var tarikh2 = new Date(tarikhHingga.value);
             var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
-            var Difference_In_Days =
-                Difference_In_Time / (1000 * 3600 * 24) + 1;
+            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
 
-            if (Difference_In_Days > 62) {
-                this.$swal({
-                    text: "Sila Pilih Tarikh Kurang Dari 2 Bulan",
-                    icon: "error",
-                    allowEscapeKey: false,
+                if(Difference_In_Days > 62){
+    
+                    Vue.swal({
+                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
+                    icon: 'error',
+                    allowEscapeKey : false,
                     showCancelButton: false,
                     showConfirmButton: true,
+                    
+                    
                 });
-            }
+              
+                } else{
+
+
+                    Vue.swal({
+                        title: 'Memuatkan...',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false,
+                        showCancelButton: false,
+                        showConfirmButton: false,
+                        timer: 8000,
+                    });
+        
+                    document.getElementById("formgadaian").submit();
+                }
+
+            
         },
-        action(tarikhmula, kodcaw, tarikhhingga) {
-            this.$refs.modal.showModal = true;
+        async generateview(){
+            await this.setJenis('view');
+
+
+            var tarikhMula = document.getElementById("tarikhmula");
+            var tarikhHingga = document.getElementById("tarikhhingga");
+            
+            var tarikh1 = new Date(tarikhMula.value);
+            var tarikh2 = new Date(tarikhHingga.value);
+            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
+            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
+
+                if(Difference_In_Days > 62){
+    
+                    Vue.swal({
+                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
+                    icon: 'error',
+                    allowEscapeKey : false,
+                    showCancelButton: false,
+                    showConfirmButton: true,
+                    
+                    
+                    });
+              
+                } else{
+
+                    Vue.swal({
+                        title: 'Memuatkan...',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false,
+                        showCancelButton: false,
+                        showConfirmButton: false,
+                        timer: 8000,
+                    });
+
+                    document.getElementById("formgadaian").submit();
+                }
+
+            
+            
+        },
+        Urlredirect: function() {
+         return window.route('cetak.gadaian')
+        },
+        setJenis: function(value){
+            return this.jenisgenerate = value;
         },
 
-        getImbangDuga(pageNumber) {
-            this.axios
-                .get(this.$hostname + "/api/reports/balancesheets/get", {
-                    params: {
-                        kodcaw: this.$kodcaw,
-                        mula: this.tarikhmula,
-                        hingga: this.tarikhhingga,
-                        page: pageNumber,
-                    },
-                })
-                .then((response) => {
-                    this.showimbangduga = response.data;
-                    this.paginate = response.data;
-                });
-        },
+        dateChecking(){
+            var tarikhMula = document.getElementById("tarikhmula");
+            var tarikhHingga = document.getElementById("tarikhhingga");
+            
+            var tarikh1 = new Date(tarikhMula.value);
+            var tarikh2 = new Date(tarikhHingga.value);
+            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
+            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
 
-        formatterfunction(value) {
-            return formatter.format(value);
-        },
-    },
-};
+                if(Difference_In_Days > 62){
+    
+                    Vue.swal({
+                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
+                    icon: 'error',
+                    allowEscapeKey : false,
+                    showCancelButton: false,
+                    showConfirmButton: true,
+                    
+                    
+                });
+              
+                } 
+
+
+        }
+    }
+    
+}
 </script>
diff --git a/resources/views/imbangduga/index.blade.php b/resources/views/imbangduga/index.blade.php
index 5cb7968..61577ac 100644
--- a/resources/views/imbangduga/index.blade.php
+++ b/resources/views/imbangduga/index.blade.php
@@ -6,7 +6,7 @@
 
         <div class="pt-6 px-4">
         <breadcrumb :items="[{ 'title' : 'Imbang Duga', 'icon' : 'fas fa-toolbox' }]"></breadcrumb>
-
+        test
         <imbangduga-component kodcaw="{{ Auth::user()->cawangan }}"></imbangduga-component>
         </div>
     </main>
@@ -14,4 +14,4 @@
 
 </div>
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 8cc35e7..57dbe27 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -59,28 +59,23 @@
                 </li>
             </a>
 
-<<<<<<< HEAD
-            {{-- <a href="{{ route('tetapanaros') }}"
+            <a href="{{ route('tetapanaros') }}"
                 class="rounded mb-2 mr-2 {{ Route::is('tetapanaros') || Route::is('tetapanaros.*')  ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
                 <li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
                     <div class="flex items-center">
                         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-                             class="bi bi-gear" viewBox="0 0 16 16">
-                            <path 
-                             d="M8 4.754a3.246 3.246 0 1 0 0 6.492 3.246 3.246 0 0 0 0-6.492M5.754 8a2.246 2.246 0 1 1 4.492 0 2.246 2.246 0 0 1-4.492 0"/>
-                            <path 
-                            d="M9.796 1.343c-.527-1.79-3.065-1.79-3.592 0l-.094.319a.873.873 0 0 1-1.255.52l-.292-.16c-1.64-.892-3.433.902-2.54 2.541l.159.292a.873.873 0 0 1-.52 1.255l-.319.094c-1.79.527-1.79 3.065 0 3.592l.319.094a.873.873 0 0 1 .52 1.255l-.16.292c-.892 1.64.901 3.434 2.541 2.54l.292-.159a.873.873 0 0 1 1.255.52l.094.319c.527 1.79 3.065 1.79 3.592 0l.094-.319a.873.873 0 0 1 1.255-.52l.292.16c1.64.893 3.434-.902 2.54-2.541l-.159-.292a.873.873 0 0 1 .52-1.255l.319-.094c1.79-.527 1.79-3.065 0-3.592l-.319-.094a.873.873 0 0 1-.52-1.255l.16-.292c.893-1.64-.902-3.433-2.541-2.54l-.292.159a.873.873 0 0 1-1.255-.52zm-2.633.283c.246-.835 1.428-.835 1.674 0l.094.319a1.873 1.873 0 0 0 2.693 1.115l.291-.16c.764-.415 1.6.42 1.184 1.185l-.159.292a1.873 1.873 0 0 0 1.116 2.692l.318.094c.835.246.835 1.428 0 1.674l-.319.094a1.873 1.873 0 0 0-1.115 2.693l.16.291c.415.764-.42 1.6-1.185 1.184l-.291-.159a1.873 1.873 0 0 0-2.693 1.116l-.094.318c-.246.835-1.428.835-1.674 0l-.094-.319a1.873 1.873 0 0 0-2.692-1.115l-.292.16c-.764.415-1.6-.42-1.184-1.185l.159-.291A1.873 1.873 0 0 0 1.945 8.93l-.319-.094c-.835-.246-.835-1.428 0-1.674l.319-.094A1.873 1.873 0 0 0 3.06 4.377l-.16-.292c-.415-.764.42-1.6 1.185-1.184l.292.159a1.873 1.873 0 0 0 2.692-1.115z"/>
-                          </svg>
+                            class="bi bi-safe2" viewBox="0 0 16 16">
+                            <path
+                                d="M1 2.5A1.5 1.5 0 0 1 2.5 1h12A1.5 1.5 0 0 1 16 2.5v12a1.5 1.5 0 0 1-1.5 1.5h-12A1.5 1.5 0 0 1 1 14.5V14H.5a.5.5 0 0 1 0-1H1V9H.5a.5.5 0 0 1 0-1H1V4H.5a.5.5 0 0 1 0-1H1v-.5zM2.5 2a.5.5 0 0 0-.5.5v12a.5.5 0 0 0 .5.5h12a.5.5 0 0 0 .5-.5v-12a.5.5 0 0 0-.5-.5h-12z" />
+                            <path
+                                d="M5.035 8h1.528c.047-.184.12-.357.214-.516l-1.08-1.08A3.482 3.482 0 0 0 5.035 8zm1.369-2.303 1.08 1.08c.16-.094.332-.167.516-.214V5.035a3.482 3.482 0 0 0-1.596.662zM9 5.035v1.528c.184.047.357.12.516.214l1.08-1.08A3.482 3.482 0 0 0 9 5.035zm2.303 1.369-1.08 1.08c.094.16.167.332.214.516h1.528a3.483 3.483 0 0 0-.662-1.596zM11.965 9h-1.528c-.047.184-.12.357-.214.516l1.08 1.08A3.483 3.483 0 0 0 11.965 9zm-1.369 2.303-1.08-1.08c-.16.094-.332.167-.516.214v1.528a3.483 3.483 0 0 0 1.596-.662zM8 11.965v-1.528a1.989 1.989 0 0 1-.516-.214l-1.08 1.08A3.483 3.483 0 0 0 8 11.965zm-2.303-1.369 1.08-1.08A1.988 1.988 0 0 1 6.563 9H5.035c.085.593.319 1.138.662 1.596zM4 8.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0zm4.5-1a1 1 0 1 0 0 2 1 1 0 0 0 0-2z" />
+                        </svg>
                         <span class="ml-2 text-lg">Tetapan</span>
                     </div>
                 </li>
-            </a> --}}
+            </a>
 
-            <a href="{{ route('pelanggan') }}"
-                class="rounded mb-2 mr-2 {{ Route::is('pelanggan') || Route::is('pelanggan.*')  ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
-=======
             <a href="{{ route('pelanggan') }}" class="rounded mb-2 mr-2 {{ Route::is('pelanggan') || Route::is('pelanggan.*')  ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
->>>>>>> cb7a1c06 (Update codebase :)
                 <li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
                     <div class="flex items-center">
                         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-person-bounding-box" viewBox="0 0 16 16">
@@ -120,6 +115,7 @@
                     <div class="flex items-center">
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75" />
+<<<<<<< HEAD
 <<<<<<< HEAD
                           </svg>
                         <span class="ml-2 text-lg">Poskod</span>
@@ -127,6 +123,14 @@
                         </svg>
                         <span class="text-sm ml-2 text-lg">Poskod</span>
 >>>>>>> cb7a1c06 (Update codebase :)
+=======
+                        </svg>
+                        <span class="text-sm ml-2 text-lg">Poskod</span>
+=======
+                          </svg>
+                        <span class="ml-2 text-lg">Poskod</span>
+>>>>>>> 4a083e10 (added akrubulananpecahan dan imbangduga range untuk tallykan)
+>>>>>>> f976f8ed (added akrubulananpecahan dan imbangduga range untuk tallykan)
                     </div>
                 </li>
             </a>