diff --git a/posawesome/posawesome/api/posapp.py b/posawesome/posawesome/api/posapp.py
index d92dacafc..c35bca32b 100644
--- a/posawesome/posawesome/api/posapp.py
+++ b/posawesome/posawesome/api/posapp.py
@@ -491,7 +491,7 @@ def update_invoice_from_order(data):
     invoice_doc.save()
     return invoice_doc
 
-
+#update def 
 @frappe.whitelist()
 def update_invoice(data):
     data = json.loads(data)
@@ -501,6 +501,12 @@ def update_invoice(data):
     else:
         invoice_doc = frappe.get_doc(data)
 
+    # FIX: Bersihkan nilai 'Nothing' yang salah dari give_item di POS Offer
+    if hasattr(invoice_doc, "posa_offers"):
+        for offer in invoice_doc.posa_offers:
+            if offer.get("give_item") == "Nothing":
+                offer.give_item = None
+
     invoice_doc.set_missing_values()
     invoice_doc.flags.ignore_permissions = True
     frappe.flags.ignore_account_permission = True
@@ -517,6 +523,7 @@ def update_invoice(data):
         for payment in invoice_doc.payments:
             if payment.default:
                 payment.amount = invoice_doc.paid_amount
+
     allow_zero_rated_items = frappe.get_cached_value(
         "POS Profile", invoice_doc.pos_profile, "posa_allow_zero_rated_items"
     )
@@ -550,7 +557,6 @@ def update_invoice(data):
     invoice_doc.save()
     return invoice_doc
 
-
 @frappe.whitelist()
 def submit_invoice(invoice, data):
     data = json.loads(data)
diff --git a/posawesome/public/js/posapp/components/Navbar.vue b/posawesome/public/js/posapp/components/Navbar.vue
index 80f03badd..8b0bfc201 100644
--- a/posawesome/public/js/posapp/components/Navbar.vue
+++ b/posawesome/public/js/posapp/components/Navbar.vue
@@ -7,7 +7,7 @@
       ></v-app-bar-nav-icon>
       <v-img
         src="/assets/posawesome/js/posapp/components/pos/pos.png"
-        alt="POS Awesome"
+        alt="GCG Reparo"
         max-width="32"
         class="mr-2"
         color="primary"
@@ -17,8 +17,8 @@
         style="cursor: pointer"
         class="text-uppercase primary--text"
       >
-        <span class="font-weight-light">pos</span>
-        <span>awesome</span>
+        <span class="font-weight-light">gcg</span>
+        <span>Reparo</span>
       </v-toolbar-title>
 
       <v-spacer></v-spacer>
@@ -157,7 +157,7 @@ export default {
       snack: false,
       snackColor: '',
       snackText: '',
-      company: 'POS Awesome',
+      company: 'GCG Reparo',
       company_img: '/assets/erpnext/images/erpnext-logo.svg',
       pos_profile: '',
       freeze: false,
@@ -192,15 +192,18 @@ export default {
     logOut() {
       var me = this;
       me.logged_out = true;
+      // Panggil metode logout dari server
       return frappe.call({
-        method: 'logout',
-        callback: function (r) {
-          if (r.exc) {
-            return;
-          }
-          frappe.set_route('/login');
-          location.reload();
-        },
+          method: 'logout',
+          callback: function (r) {
+              if (r.exc) {
+                  console.error('Logout error:', r.exc);
+                  return;
+              }
+
+              // Redirect manual ke halaman /reparo-front
+              window.location.href = '/reparo-front';
+          },
       });
     },
     print_last_invoice() {
diff --git a/posawesome/public/js/posapp/components/pos/Customer.vue b/posawesome/public/js/posapp/components/pos/Customer.vue
index 86a5f036e..37f7ade6d 100644
--- a/posawesome/public/js/posapp/components/pos/Customer.vue
+++ b/posawesome/public/js/posapp/components/pos/Customer.vue
@@ -1,136 +1,159 @@
 <template>
   <div>
     <v-autocomplete
+      :key="autocompleteKey"
       dense
       clearable
       auto-select-first
       outlined
       color="primary"
       :label="frappe._('Customer')"
-      v-model="customer"
-      :items="customers"
-      item-text="customer_name"
-      item-value="name"
+      v-model="selectedCustomer"
+      :items="processedCustomers"
+      item-text="display_name"
+      item-value="unique_key"  
       background-color="white"
       :no-data-text="__('Customer not found')"
       hide-details
       :filter="customFilter"
       :disabled="readonly"
-      append-icon="mdi-plus"
+      append-icon="mdi-account-plus"
       @click:append="new_customer"
-      prepend-inner-icon="mdi-account-edit"
+      prepend-inner-icon="mdi-car-multiple"
       @click:prepend-inner="edit_customer"
     >
-      <template v-slot:item="data">
-        <template>
-          <v-list-item-content>
-            <v-list-item-title
-              class="primary--text subtitle-1"
-              v-html="data.item.customer_name"
-            ></v-list-item-title>
-            <v-list-item-subtitle
-              v-if="data.item.customer_name != data.item.name"
-              v-html="`ID: ${data.item.name}`"
-            ></v-list-item-subtitle>
-            <v-list-item-subtitle
-              v-if="data.item.tax_id"
-              v-html="`TAX ID: ${data.item.tax_id}`"
-            ></v-list-item-subtitle>
-            <v-list-item-subtitle
-              v-if="data.item.email_id"
-              v-html="`Email: ${data.item.email_id}`"
-            ></v-list-item-subtitle>
-            <v-list-item-subtitle
-              v-if="data.item.mobile_no"
-              v-html="`Mobile No: ${data.item.mobile_no}`"
-            ></v-list-item-subtitle>
-            <v-list-item-subtitle
-              v-if="data.item.primary_address"
-              v-html="`Primary Address: ${data.item.primary_address}`"
-            ></v-list-item-subtitle>
-          </v-list-item-content>
-        </template>
+      <template v-slot:item="{ item }">
+        <v-list-item-content>
+          <v-list-item-title class="primary--text subtitle-1">
+            {{ item.display_name || 'NO DISPLAY NAME' }}
+          </v-list-item-title>
+          <v-list-item-subtitle v-if="item.license_plate">
+            License Plate: {{ item.license_plate }}
+          </v-list-item-subtitle>
+          <v-list-item-subtitle v-if="item.mobile_no">
+            Mobile No: {{ item.mobile_no }}
+          </v-list-item-subtitle>
+        </v-list-item-content>
       </template>
     </v-autocomplete>
     <div class="mb-8">
-      <UpdateCustomer></UpdateCustomer>
+      <UpdateCustomer />
     </div>
   </div>
 </template>
 
 <script>
-import { evntBus } from '../../bus';
-import UpdateCustomer from './UpdateCustomer.vue';
+import { evntBus } from "../../bus";
+import UpdateCustomer from "./UpdateCustomer.vue";
+
 export default {
-  data: () => ({
-    pos_profile: '',
-    customers: [],
-    customer: '',
-    readonly: false,
-    customer_info: {},
-  }),
+  data() {
+    return {
+      pos_profile: "",
+      customers: [],
+      selectedCustomer: "", // Menyimpan customer_id saja
+      autocompleteKey: 0,
+      readonly: false,
+      customer_info: {},
+    };
+  },
 
   components: {
     UpdateCustomer,
   },
 
+  computed: {
+    processedCustomers() {
+      let processed = [];
+      console.log("Data Customers:", this.customers);
+
+      this.customers.forEach((customer) => {
+        if (customer.vehicles && customer.vehicles.length > 0) {
+          customer.vehicles.forEach((vehicle) => {
+            processed.push({
+              customer_id: customer.name, // Hanya simpan customer.name
+              customer_name: customer.customer_name,
+              display_name: `${customer.customer_name} : ${vehicle.license_plate}`,
+              license_plate: vehicle.license_plate,
+              mobile_no: customer.mobile_no || "N/A",
+              unique_key: `${customer.name}_${vehicle.license_plate}`, // Buat kombinasi unik
+            });
+          });
+        } else {
+          processed.push({
+            customer_id: customer.name, // Hanya simpan customer.name
+            customer_name: customer.customer_name,
+            display_name: customer.customer_name,
+            license_plate: null,
+            mobile_no: customer.mobile_no || "N/A",
+            unique_key: `${customer.name}_no_license`, // Unik meskipun tanpa kendaraan
+          });
+        }
+      });
+
+      console.log("Processed Customers:", processed);
+      return processed;
+    },
+  },
+
   methods: {
     get_customer_names() {
-      const vm = this;
-      if (this.customers.length > 0) {
-        return;
-      }
-      if (vm.pos_profile.posa_local_storage && localStorage.customer_storage) {
-        vm.customers = JSON.parse(localStorage.getItem('customer_storage'));
+      if (this.customers.length > 0) return;
+
+      if (this.pos_profile.posa_local_storage && localStorage.customer_storage) {
+        try {
+          this.customers = JSON.parse(localStorage.getItem("customer_storage"));
+        } catch (e) {
+          console.error("Error parsing customer_storage:", e);
+        }
       }
+
       frappe.call({
-        method: 'posawesome.posawesome.api.posapp.get_customer_names',
+        method: "reparo.api.customer.get_customer_names",
         args: {
           pos_profile: this.pos_profile.pos_profile,
         },
-        callback: function (r) {
-          if (r.message) {
-            vm.customers = r.message;
-            console.info('loadCustomers');
-            if (vm.pos_profile.posa_local_storage) {
-              localStorage.setItem('customer_storage', '');
-              localStorage.setItem(
-                'customer_storage',
-                JSON.stringify(r.message)
-              );
+        callback: (r) => {
+          console.log("API Response:", r.message);
+          if (r.message && Array.isArray(r.message)) {
+            this.$set(this, "customers", [...r.message]); // Paksa Vue mengenali perubahan
+            if (this.pos_profile.posa_local_storage) {
+              localStorage.setItem("customer_storage", JSON.stringify(r.message));
             }
+          } else {
+            console.error("Invalid response format:", r);
           }
         },
       });
     },
+
     new_customer() {
-      evntBus.$emit('open_update_customer', null);
+      evntBus.$emit("open_update_customer", null);
+      this.$nextTick(() => {
+        this.$set(this, "selectedCustomer", ""); 
+        this.autocompleteKey++; 
+      });
     },
+
     edit_customer() {
-      evntBus.$emit('open_update_customer', this.customer_info);
+      evntBus.$emit("open_update_customer", this.customer_info);
+      this.$nextTick(() => {
+        this.$set(this, "selectedCustomer", ""); 
+        this.autocompleteKey++; 
+      });
     },
-    customFilter(item, queryText, itemText) {
-      const textOne = item.customer_name
-        ? item.customer_name.toLowerCase()
-        : '';
-      const textTwo = item.tax_id ? item.tax_id.toLowerCase() : '';
-      const textThree = item.email_id ? item.email_id.toLowerCase() : '';
-      const textFour = item.mobile_no ? item.mobile_no.toLowerCase() : '';
-      const textFifth = item.name.toLowerCase();
-      const searchText = queryText.toLowerCase();
 
+    customFilter(item, queryText) {
+      if (!queryText) return true;
+      const searchText = queryText.toLowerCase();
       return (
-        textOne.indexOf(searchText) > -1 ||
-        textTwo.indexOf(searchText) > -1 ||
-        textThree.indexOf(searchText) > -1 ||
-        textFour.indexOf(searchText) > -1 ||
-        textFifth.indexOf(searchText) > -1
+        item.customer_name.toLowerCase().includes(searchText) ||
+        (item.license_plate && item.license_plate.toLowerCase().includes(searchText)) ||
+        (item.mobile_no && item.mobile_no.toLowerCase().includes(searchText))
       );
     },
   },
 
-  computed: {},
-
   created: function () {
     this.$nextTick(function () {
       evntBus.$on('register_pos_profile', (pos_profile) => {
@@ -141,27 +164,47 @@ export default {
         this.pos_profile = pos_profile;
         this.get_customer_names();
       });
-      evntBus.$on('set_customer', (customer) => {
-        this.customer = customer;
+      evntBus.$on("set_customer", (customer) => {
+        const selected = this.processedCustomers.find(c => c.customer_id === customer);
+        if (selected) {
+          this.selectedCustomer = selected.unique_key;
+        }
       });
-      evntBus.$on('add_customer_to_list', (customer) => {
+      evntBus.$on("add_customer_to_list", (customer) => {
         this.customers.push(customer);
       });
-      evntBus.$on('set_customer_readonly', (value) => {
+      evntBus.$on("set_customer_readonly", (value) => {
         this.readonly = value;
       });
-      evntBus.$on('set_customer_info_to_edit', (data) => {
+      evntBus.$on("set_customer_info_to_edit", (data) => {
         this.customer_info = data;
       });
-      evntBus.$on('fetch_customer_details', () => {
+      evntBus.$on("fetch_customer_details", () => {
         this.get_customer_names();
       });
+      evntBus.$on("customer_updated", () => {
+        this.$nextTick(() => {
+          this.selectedCustomer = ""; // Reset setelah update data customer
+        });
+      });
     });
   },
 
   watch: {
-    customer() {
-      evntBus.$emit('update_customer', this.customer);
+    selectedCustomer(newVal) {
+      if (!newVal) return;
+
+      const selectedCustomerObj = this.processedCustomers.find(
+        (c) => c.unique_key === newVal
+      );
+
+      if (selectedCustomerObj) {
+        this.customer = selectedCustomerObj.customer_name;
+        evntBus.$emit("update_customer", this.customer);
+        this.selectedCustomer = ""; // Reset otomatis setelah update event
+      } else {
+        this.selectedCustomer = ""; // Reset jika tidak ditemukan
+      }
     },
   },
 };
diff --git a/posawesome/public/js/posapp/components/pos/UpdateCustomer.vue b/posawesome/public/js/posapp/components/pos/UpdateCustomer.vue
index 13b495b91..a8594b34d 100644
--- a/posawesome/public/js/posapp/components/pos/UpdateCustomer.vue
+++ b/posawesome/public/js/posapp/components/pos/UpdateCustomer.vue
@@ -8,7 +8,7 @@
       <v-card>
         <v-card-title>
           <span v-if="customer_id" class="headline primary--text">{{
-            __('Update Customer')
+            __('Add new vehicle')
           }}</span>
           <span v-else class="headline primary--text">{{
             __('Create Customer')
@@ -17,6 +17,7 @@
         <v-card-text class="pa-0">
           <v-container>
             <v-row>
+              <!-- Customer Name -->
               <v-col cols="12">
                 <v-text-field
                   dense
@@ -27,54 +28,53 @@
                   v-model="customer_name"
                 ></v-text-field>
               </v-col>
+              <!-- Email ID and Mobile No -->
               <v-col cols="6">
                 <v-text-field
                   dense
                   color="primary"
-                  :label="frappe._('Tax ID')"
+                  :label="frappe._('Email Id') + ' *'"
                   background-color="white"
                   hide-details
-                  v-model="tax_id"
+                  v-model="email_id"
                 ></v-text-field>
               </v-col>
               <v-col cols="6">
                 <v-text-field
                   dense
                   color="primary"
-                  :label="frappe._('Mobile No')"
+                  :label="frappe._('Mobile No') + ' *'"
                   background-color="white"
                   hide-details
                   v-model="mobile_no"
                 ></v-text-field>
               </v-col>
-              <v-col cols="6">
-                <v-text-field
-                  dense
-                  color="primary"
-                  :label="frappe._('Email Id')"
-                  background-color="white"
-                  hide-details
-                  v-model="email_id"
-                ></v-text-field>
-              </v-col>
-              <v-col cols="6">
-                <v-select
-                  dense
-                  label="Gender"
-                  :items="genders"
-                  v-model="gender"
-                ></v-select>
-              </v-col>
-              <v-col cols="6">
-                <v-text-field
-                  dense
-                  color="primary"
-                  :label="frappe._('Referral Code')"
-                  background-color="white"
-                  hide-details
-                  v-model="referral_code"
-                ></v-text-field>
+              <!-- Vehicles -->
+              <v-col cols="12" v-for="(vehicle, index) in vehicles" :key="vehicle.id || index">
+                <v-row>
+                  <v-col cols="6">
+                    <v-text-field
+                      dense
+                      color="primary"
+                      :label="`License Plate *`"
+                      background-color="white"
+                      hide-details
+                      v-model="vehicle.license_plate"
+                    ></v-text-field>
+                  </v-col>
+                  <v-col cols="6">
+                    <v-text-field
+                      dense
+                      color="primary"
+                      :label="`Vehicle Brand *`"
+                      background-color="white"
+                      hide-details
+                      v-model="vehicle.brand"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
               </v-col>
+              <!-- Referral Code and Birthday -->
               <v-col cols="6">
                 <v-menu
                   ref="birthday_menu"
@@ -107,6 +107,7 @@
                   </v-date-picker>
                 </v-menu>
               </v-col>
+              <!-- Customer Group and Territory -->
               <v-col cols="6">
                 <v-autocomplete
                   clearable
@@ -129,7 +130,7 @@
                   dense
                   auto-select-first
                   color="primary"
-                  :label="frappe._('Territory') + ' *'"
+                  :label="frappe._('Country') + ' *'"
                   v-model="territory"
                   :items="territorys"
                   background-color="white"
@@ -139,6 +140,7 @@
                 >
                 </v-autocomplete>
               </v-col>
+              <!-- Loyalty Program and Points -->
               <v-col cols="6" v-if="loyalty_program">
                 <v-text-field
                   v-model="loyalty_program"
@@ -176,6 +178,7 @@
 
 <script>
 import { evntBus } from '../../bus';
+
 export default {
   data: () => ({
     customerDialog: false,
@@ -188,18 +191,24 @@ export default {
     referral_code: '',
     birthday: null,
     birthday_menu: false,
-    group: '',
+    group: 'Individual', // Default value
     groups: [],
-    territory: '',
+    territory: 'Indonesia', // Default value
     territorys: [],
     genders: [],
     customer_type: 'Individual',
     gender: '',
+    vehicles: [{ license_plate: '', brand: '' }],
     loyalty_points: null,
     loyalty_program: null,
   }),
-  watch: {},
   methods: {
+    addVehicle() {
+      this.$set(this.vehicles, this.vehicles.length, { license_plate: '', brand: '' });
+    },
+    removeVehicle(index) {
+      this.vehicles.splice(index, 1);
+    },
     close_dialog() {
       this.customerDialog = false;
       this.clear_customer();
@@ -208,11 +217,12 @@ export default {
       this.customer_name = '';
       this.tax_id = '';
       this.mobile_no = '';
+      this.vehicles = [{ license_plate: '', brand: '' }];
       this.email_id = '';
       this.referral_code = '';
       this.birthday = '';
-      this.group = frappe.defaults.get_user_default('Customer Group');
-      this.territory = frappe.defaults.get_user_default('Territory');
+      this.group = 'Individual'; // Default value
+      this.territory = 'Indonesia'; // Default value
       this.customer_id = '';
       this.customer_type = 'Individual';
       this.gender = '';
@@ -271,7 +281,7 @@ export default {
         });
     },
     submit_dialog() {
-      // validate if all required fields are filled
+      // Validasi input
       if (!this.customer_name) {
         evntBus.$emit('show_mesage', {
           text: __('Customer name is required.'),
@@ -279,6 +289,20 @@ export default {
         });
         return;
       }
+      if (!this.email_id) {
+        evntBus.$emit('show_mesage', {
+          text: __('Email ID is required.'),
+          color: 'error',
+        });
+        return;
+      }
+      if (!this.mobile_no) {
+        evntBus.$emit('show_mesage', {
+          text: __('Mobile number is required.'),
+          color: 'error',
+        });
+        return;
+      }
       if (!this.group) {
         evntBus.$emit('show_mesage', {
           text: __('Customer group is required.'),
@@ -288,59 +312,63 @@ export default {
       }
       if (!this.territory) {
         evntBus.$emit('show_mesage', {
-          text: __('Customer territory is required.'),
+          text: __('Territory is required.'),
           color: 'error',
         });
         return;
       }
-      if (this.customer_name) {
-        const vm = this;
-        const args = {
-          customer_id: this.customer_id,
-          customer_name: this.customer_name,
-          company: this.pos_profile.company,
-          tax_id: this.tax_id,
-          mobile_no: this.mobile_no,
-          email_id: this.email_id,
-          referral_code: this.referral_code,
-          birthday: this.birthday,
-          customer_group: this.group,
-          territory: this.territory,
-          customer_type: this.customer_type,
-          gender: this.gender,
-          method: this.customer_id ? 'update' : 'create',
-          pos_profile_doc: this.pos_profile,
-        };
-        frappe.call({
-          method: 'posawesome.posawesome.api.posapp.create_customer',
-          args: args,
-          callback: (r) => {
-            if (!r.exc && r.message.name) {
-              let text = __('Customer created successfully.');
-              if (vm.customer_id) {
-                text = __('Customer updated successfully.');
-              }
-              evntBus.$emit('show_mesage', {
-                text: text,
-                color: 'success',
-              });
-              args.name = r.message.name;
-              frappe.utils.play_sound('submit');
-              evntBus.$emit('add_customer_to_list', args);
-              evntBus.$emit('set_customer', r.message.name);
-              evntBus.$emit('fetch_customer_details');
-              this.close_dialog();
-            } else {
-              frappe.utils.play_sound('error');
-              evntBus.$emit('show_mesage', {
-                text: __('Customer creation failed.'),
-                color: 'error',
-              });
-            }
-          },
+      // Validate vehicles
+      const invalidVehicles = this.vehicles.some(
+        (vehicle) => !vehicle.license_plate || !vehicle.brand
+      );
+      if (invalidVehicles) {
+        evntBus.$emit('show_mesage', {
+          text: __('Please fill all vehicle details.'),
+          color: 'error',
         });
-        this.customerDialog = false;
+        return;
       }
+      // Submit customer data
+      const vm = this;
+      const args = {
+        customer_id: this.customer_id,
+        customer_name: this.customer_name,
+        company: this.pos_profile.company,
+        tax_id: this.tax_id,
+        vehicles: this.vehicles,
+        email_id: this.email_id,
+        referral_code: this.referral_code,
+        birthday: this.birthday,
+        customer_group: this.group,
+        territory: this.territory,
+        customer_type: this.customer_type,
+        gender: this.gender,
+        method: this.customer_id ? 'update' : 'create',
+        pos_profile_doc: this.pos_profile,
+      };
+      frappe.call({
+        method: 'reparo.api.customer.create_customer',
+        args: args,
+        callback: (r) => {
+          if (!r.exc && r.message.name) {
+            let text = __('Customer created successfully.');
+            if (this.customer_id) {
+              text = __('Customer updated successfully.');
+            }
+            evntBus.$emit('show_mesage', {
+              text: text,
+              color: 'success',
+            });
+            this.close_dialog();
+          } else {
+            evntBus.$emit('show_mesage', {
+              text: __('Customer creation failed.'),
+              color: 'error',
+            });
+          }
+        },
+      });
+      this.customerDialog = false;
     },
   },
   created: function () {
@@ -351,28 +379,40 @@ export default {
         this.customer_id = data.name;
         this.tax_id = data.tax_id;
         this.mobile_no = data.mobile_no;
+        if (data.vehicles && Array.isArray(data.vehicles) && data.vehicles.length > 0) {
+          this.vehicles = data.vehicles.map(vehicle => ({
+            license_plate: vehicle.license_plate || '',
+            brand: vehicle.brand || ''
+          }));
+        } else {
+          this.vehicles = [{ license_plate: '', brand: '' }];
+        }
         this.email_id = data.email_id;
         this.referral_code = data.referral_code;
         this.birthday = data.birthday;
-        this.group = data.customer_group;
-        this.territory = data.territory;
+        this.group = data.customer_group || 'Individual'; // Default to 'Individual'
+        this.territory = data.territory || 'Indonesia'; // Default to 'Indonesia'
         this.loyalty_points = data.loyalty_points;
         this.loyalty_program = data.loyalty_program;
         this.gender = data.gender;
       }
     });
+
     evntBus.$on('register_pos_profile', (data) => {
       this.pos_profile = data.pos_profile;
     });
+
     evntBus.$on('payments_register_pos_profile', (data) => {
       this.pos_profile = data.pos_profile;
     });
+
     this.getCustomerGroups();
     this.getCustomerTerritorys();
     this.getGenders();
-    // set default values for customer group and territory from user defaults
-    this.group = frappe.defaults.get_user_default('Customer Group');
-    this.territory = frappe.defaults.get_user_default('Territory');
+
+    // Set default values for new customers
+    this.group = 'Individual';
+    this.territory = 'Indonesia';
   },
 };
-</script>
+</script>
\ No newline at end of file