fix: master member

app/Http/Controllers/MemberController.php

@@ -6,7 +6,6 @@ use App\Http\Requests\Member\StoreMemberRequest;
 use App\Http\Requests\Member\UpdateMemberRequest;
 use App\Models\Member;
 use App\Models\TypeMember;
-use App\Models\TypeVehicle;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\DB;
 use Inertia\Inertia;
@@ -51,16 +50,17 @@ class MemberController extends Controller
                 'label' => $typeMember->type,
                 'value' => $typeMember->id,
             ]),
-            'typeVehicles' => TypeVehicle::get()->transform(fn($typeVehicle) => [
-                'label' => $typeVehicle->type,
-                'value' => $typeVehicle->id,
-            ]),
             'typeMember' => Inertia::lazy(
                 fn() => TypeMember::filter(request('id'))->get()->transform(fn($typeMember) => [
                     'type' => $typeMember->type,
                     'description' => $typeMember->description,
                     'price' => $typeMember->price,
-                    'max' => $typeMember->max,
+                    'max' => $typeMember->maxVehicleDetail(),
+                    'maxVehicles' => $typeMember->fresh()->maxVehicles->transform(fn($maxVehicle) => [
+                        'value' => $maxVehicle->id,
+                        'label' => $maxVehicle->typeVehicle->type,
+                        'max' => $maxVehicle->max,
+                    ]),
                 ])->first()
             ),
         ]);

app/Models/TypeMember.php

@@ -60,7 +60,7 @@ class TypeMember extends Model
 
     public function maxVehicleDetail()
     {
-        $maxVehicle = $this->maxVehicles->transform(fn($maxVehicle) => $maxVehicle->typeVehicle->type . ', ' . 'Maksimal Kendaraan ' . $maxVehicle->max)->toArray();
+        $maxVehicle = $this->maxVehicles->transform(fn($maxVehicle) => "{$maxVehicle->typeVehicle->type}, maksimal ({$maxVehicle->max})")->toArray();
 
         return implode(". ", $maxVehicle);
     }

public/js/resources_js_pages_member_Create_vue.js

@@ -542,41 +542,31 @@ __webpack_require__.r(__webpack_exports__);
     };
 
     var addPlatNumber = function addPlatNumber() {
-      form.clearErrors('plat_number', 'type_vehicle_id');
-
-      if (!form.plat_number) {
-        form.setError('plat_number', 'Plat kendaraan tidak boleh kosong');
-        return;
-      }
-
-      if (!form.type_vehicle_id) {
-        form.setError('type_vehicle_id', 'Tidak boleh kosong');
-        return;
-      }
-
-      var listPlatNumberExist = listPlatNumber.filter(function (val) {
-        return val.platNumber === form.plat_number.toUpperCase();
-      });
-
-      if (listPlatNumberExist.length) {
-        form.setError('plat_number', 'Nomor plat kendaraan tidak boleh sama');
-        return;
-      }
-
-      if (listPlatNumber.length + 1 > props.typeMember.max) {
-        form.setError('plat_number', 'Melibihi batas maksimal kendaraan');
-        return;
-      }
-
-      var typeVehicleFilter = props.typeVehicles.filter(function (val) {
-        return val.value === form.type_vehicle_id;
-      })[0];
-      listPlatNumber.push({
-        platNumber: form.plat_number.toUpperCase(),
-        typeVehicle: typeVehicleFilter.label,
-        typeVehicleId: typeVehicleFilter.value
-      });
-      form.reset('plat_number', 'type_vehicle_id');
+      console.log(props.typeMember.maxVehicles); //   form.clearErrors('plat_number', 'type_vehicle_id')
+      //   if (!form.plat_number) {
+      //     form.setError('plat_number', 'Plat kendaraan tidak boleh kosong')
+      //     return
+      //   }
+      //   if (!form.type_vehicle_id) {
+      //     form.setError('type_vehicle_id', 'Tidak boleh kosong')
+      //     return
+      //   }
+      //   const listPlatNumberExist = listPlatNumber.filter((val) => val.platNumber === form.plat_number.toUpperCase())
+      //   if (listPlatNumberExist.length) {
+      //     form.setError('plat_number', 'Nomor plat kendaraan tidak boleh sama')
+      //     return
+      //   }
+      //   if (listPlatNumber.length + 1 > props.typeMember.max) {
+      //     form.setError('plat_number', 'Melibihi batas maksimal kendaraan')
+      //     return
+      //   }
+      //   const typeVehicleFilter = props.typeVehicles.filter((val) => val.value === form.type_vehicle_id)[0]
+      //   listPlatNumber.push({
+      //     platNumber: form.plat_number.toUpperCase(),
+      //     typeVehicle: typeVehicleFilter.label,
+      //     typeVehicleId: typeVehicleFilter.value,
+      //   })
+      //   form.reset('plat_number', 'type_vehicle_id')
     };
 
     var form = (0,_inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_2__.useForm)({
@@ -1342,6 +1332,7 @@ var _hoisted_13 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElement
 );
 
 var _hoisted_14 = {
+  key: 0,
   "class": "grid"
 };
 var _hoisted_15 = {
@@ -1357,22 +1348,14 @@ var _hoisted_18 = {
   "class": "col-12 md:col-6"
 };
 var _hoisted_19 = {
-  "class": "col-12 flex flex-column md:flex-row md:align-items-center justify-content-end mb-3 md:mb-0"
+  "class": "col-12 mb-3 md:mb-0"
 };
 var _hoisted_20 = {
+  "class": "flex flex-column md:flex-row md:align-items-center justify-content-end"
+};
+var _hoisted_21 = {
   "class": "col-12"
 };
-
-var _hoisted_21 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("h1", {
-  "class": "text-base"
-}, [/*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("i", {
-  "class": "pi pi-car"
-}), /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createTextVNode)(), /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("span", {
-  "class": "ml-2"
-}, "Daftar Plat Kendaraan")], -1
-/* HOISTED */
-);
-
 var _hoisted_22 = {
   style: {
     "color": "#b71c1c"
@@ -1462,7 +1445,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
         })
       } : undefined]), 1024
       /* DYNAMIC_SLOTS */
-      )])]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_14, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_15, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Card, null, {
+      )])]), $props.typeMember ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)("div", _hoisted_14, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_15, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Card, null, {
         content: (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
           return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_16, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_17, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppInputText"], {
             modelValue: $setup.form.plat_number,
@@ -1483,11 +1466,11 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
             label: "Jenis Kendaraan",
             placeholder: "jenis kendaraan",
             disabled: !$setup.form.type_member_id,
-            options: $props.typeVehicles,
+            options: $props.typeMember.maxVehicles,
             error: $setup.form.errors.type_vehicle_id
           }, null, 8
           /* PROPS */
-          , ["modelValue", "disabled", "options", "error"])]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_19, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Button, {
+          , ["modelValue", "disabled", "options", "error"])]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_19, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_20, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Button, {
             label: "Tambah",
             "class": "p-button-outlined",
             icon: "pi pi-car",
@@ -1495,7 +1478,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: $setup.addPlatNumber
           }, null, 8
           /* PROPS */
-          , ["disabled"])]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_20, [_hoisted_21, (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_DataTable, {
+          , ["disabled"])])]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_21, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_DataTable, {
             "striped-rows": "",
             "row-hover": "",
             "responsive-layout": "scroll",
@@ -1566,7 +1549,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
         /* STABLE */
 
-      })])])];
+      })])])) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true)];
     }),
     _: 1
     /* STABLE */

public/js/vue.js

@@ -58101,7 +58101,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
 /******/ 		// This function allow to reference async chunks
 /******/ 		__webpack_require__.u = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"5b9f0529bda25a9b","resources_js_pages_auth_Login_vue":"61b9c9ae1ae9da32","resources_js_pages_auth_ResetPassword_vue":"b091193a1e114ce8","resources_js_pages_auth_VerifyEmail_vue":"a7b9a99e5a331088","resources_js_pages_expense_Create_vue":"1772093ec9ad8e1f","resources_js_pages_expense_Index_vue":"51f7facd5c3c3ea6","resources_js_pages_expense_Show_vue":"6200e318fe2f7fed","resources_js_pages_expense_TableHeader_js":"eed3f0613f167cfd","resources_js_pages_home_Index_vue":"6cd0224828ac8129","resources_js_pages_member_Create_vue":"3ca394fe875a5c72","resources_js_pages_member_Edit_vue":"7b222567b848883e","resources_js_pages_member_Index_vue":"71a31a774bb1b571","resources_js_pages_member_TableHeader_js":"51dbf053f7ddd45c","resources_js_pages_topup_Create_vue":"24940afcdac09553","resources_js_pages_topup_Edit_vue":"258c3b0746574dc0","resources_js_pages_topup_Index_vue":"70bcf9869c3024d0","resources_js_pages_topup_Show_vue":"cb35ad21e9ce163f","resources_js_pages_topup_TableHeader_js":"c0dc89df0e3b8b7d","resources_js_pages_typemember_Create_vue":"e9028dd632c51636","resources_js_pages_typemember_Edit_vue":"c51c01c7afe7241d","resources_js_pages_typemember_Index_vue":"3c3878e1d6568226","resources_js_pages_typemember_TableHeader_js":"ac1d31a59f8d464e","resources_js_pages_typevehicle_Create_vue":"0f937d93865a1ea2","resources_js_pages_typevehicle_Edit_vue":"edba97a3715ba957","resources_js_pages_typevehicle_Index_vue":"53c702d33feb6196","resources_js_pages_typevehicle_TableHeader_js":"a40378918fbe74e1","resources_js_pages_user_Create_vue":"361bf2589467f820","resources_js_pages_user_Edit_vue":"fdb844cf830ec11c","resources_js_pages_user_Index_vue":"16d93eb7e5210300","resources_js_pages_user_Show_vue":"138fd92d6ae36518","resources_js_pages_user_TableHeader_js":"0d87fd422fe40491"}[chunkId] + "";
+/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"5b9f0529bda25a9b","resources_js_pages_auth_Login_vue":"61b9c9ae1ae9da32","resources_js_pages_auth_ResetPassword_vue":"b091193a1e114ce8","resources_js_pages_auth_VerifyEmail_vue":"a7b9a99e5a331088","resources_js_pages_expense_Create_vue":"1772093ec9ad8e1f","resources_js_pages_expense_Index_vue":"51f7facd5c3c3ea6","resources_js_pages_expense_Show_vue":"6200e318fe2f7fed","resources_js_pages_expense_TableHeader_js":"eed3f0613f167cfd","resources_js_pages_home_Index_vue":"6cd0224828ac8129","resources_js_pages_member_Create_vue":"14b9578191b85d48","resources_js_pages_member_Edit_vue":"7b222567b848883e","resources_js_pages_member_Index_vue":"71a31a774bb1b571","resources_js_pages_member_TableHeader_js":"51dbf053f7ddd45c","resources_js_pages_topup_Create_vue":"24940afcdac09553","resources_js_pages_topup_Edit_vue":"258c3b0746574dc0","resources_js_pages_topup_Index_vue":"70bcf9869c3024d0","resources_js_pages_topup_Show_vue":"cb35ad21e9ce163f","resources_js_pages_topup_TableHeader_js":"c0dc89df0e3b8b7d","resources_js_pages_typemember_Create_vue":"e9028dd632c51636","resources_js_pages_typemember_Edit_vue":"c51c01c7afe7241d","resources_js_pages_typemember_Index_vue":"3c3878e1d6568226","resources_js_pages_typemember_TableHeader_js":"ac1d31a59f8d464e","resources_js_pages_typevehicle_Create_vue":"0f937d93865a1ea2","resources_js_pages_typevehicle_Edit_vue":"edba97a3715ba957","resources_js_pages_typevehicle_Index_vue":"53c702d33feb6196","resources_js_pages_typevehicle_TableHeader_js":"a40378918fbe74e1","resources_js_pages_user_Create_vue":"361bf2589467f820","resources_js_pages_user_Edit_vue":"fdb844cf830ec11c","resources_js_pages_user_Index_vue":"16d93eb7e5210300","resources_js_pages_user_Show_vue":"138fd92d6ae36518","resources_js_pages_user_TableHeader_js":"0d87fd422fe40491"}[chunkId] + "";
 /******/ 		};
 /******/ 	})();
 /******/ 	

resources/js/pages/member/Create.vue

@@ -33,41 +33,33 @@ const listPlatNumberOnDelete = (index) => {
 }
 
 const addPlatNumber = () => {
-  form.clearErrors('plat_number', 'type_vehicle_id')
-
-  if (!form.plat_number) {
-    form.setError('plat_number', 'Plat kendaraan tidak boleh kosong')
-
-    return
-  }
-
-  if (!form.type_vehicle_id) {
-    form.setError('type_vehicle_id', 'Tidak boleh kosong')
-
-    return
-  }
-
-  const listPlatNumberExist = listPlatNumber.filter((val) => val.platNumber === form.plat_number.toUpperCase())
-  if (listPlatNumberExist.length) {
-    form.setError('plat_number', 'Nomor plat kendaraan tidak boleh sama')
-
-    return
-  }
-
-  if (listPlatNumber.length + 1 > props.typeMember.max) {
-    form.setError('plat_number', 'Melibihi batas maksimal kendaraan')
-
-    return
-  }
-
-  const typeVehicleFilter = props.typeVehicles.filter((val) => val.value === form.type_vehicle_id)[0]
-  listPlatNumber.push({
-    platNumber: form.plat_number.toUpperCase(),
-    typeVehicle: typeVehicleFilter.label,
-    typeVehicleId: typeVehicleFilter.value,
-  })
-
-  form.reset('plat_number', 'type_vehicle_id')
+  console.log(props.typeMember.maxVehicles)
+
+  //   form.clearErrors('plat_number', 'type_vehicle_id')
+  //   if (!form.plat_number) {
+  //     form.setError('plat_number', 'Plat kendaraan tidak boleh kosong')
+  //     return
+  //   }
+  //   if (!form.type_vehicle_id) {
+  //     form.setError('type_vehicle_id', 'Tidak boleh kosong')
+  //     return
+  //   }
+  //   const listPlatNumberExist = listPlatNumber.filter((val) => val.platNumber === form.plat_number.toUpperCase())
+  //   if (listPlatNumberExist.length) {
+  //     form.setError('plat_number', 'Nomor plat kendaraan tidak boleh sama')
+  //     return
+  //   }
+  //   if (listPlatNumber.length + 1 > props.typeMember.max) {
+  //     form.setError('plat_number', 'Melibihi batas maksimal kendaraan')
+  //     return
+  //   }
+  //   const typeVehicleFilter = props.typeVehicles.filter((val) => val.value === form.type_vehicle_id)[0]
+  //   listPlatNumber.push({
+  //     platNumber: form.plat_number.toUpperCase(),
+  //     typeVehicle: typeVehicleFilter.label,
+  //     typeVehicleId: typeVehicleFilter.value,
+  //   })
+  //   form.reset('plat_number', 'type_vehicle_id')
 }
 
 const form = useForm({
@@ -163,7 +155,7 @@ const submit = () => {
       </div>
     </div>
 
-    <div class="grid">
+    <div v-if="typeMember" class="grid">
       <div class="col-12 md:col-8">
         <Card>
           <template #content>
@@ -183,22 +175,22 @@ const submit = () => {
                   label="Jenis Kendaraan"
                   placeholder="jenis kendaraan"
                   :disabled="!form.type_member_id"
-                  :options="typeVehicles"
+                  :options="typeMember.maxVehicles"
                   :error="form.errors.type_vehicle_id"
                 />
               </div>
-              <div class="col-12 flex flex-column md:flex-row md:align-items-center justify-content-end mb-3 md:mb-0">
-                <Button
-                  label="Tambah"
-                  class="p-button-outlined"
-                  icon="pi pi-car"
-                  :disabled="!form.type_member_id"
-                  @click="addPlatNumber"
-                />
+              <div class="col-12 mb-3 md:mb-0">
+                <div class="flex flex-column md:flex-row md:align-items-center justify-content-end">
+                  <Button
+                    label="Tambah"
+                    class="p-button-outlined"
+                    icon="pi pi-car"
+                    :disabled="!form.type_member_id"
+                    @click="addPlatNumber"
+                  />
+                </div>
               </div>
               <div class="col-12">
-                <h1 class="text-base"><i class="pi pi-car"></i> <span class="ml-2">Daftar Plat Kendaraan</span></h1>
-
                 <DataTable
                   striped-rows
                   row-hover