Przeglądaj źródła

fix: user and customer master

rodzic
commit
f1f0812334

+ 4
- 4
app/Http/Controllers/CustomerController.php Wyświetl plik

62
     /**
62
     /**
63
      * Display the specified resource.
63
      * Display the specified resource.
64
      *
64
      *
65
-     * @param  int  $id
65
+     * @param  Customer $customer
66
      * @return \Illuminate\Http\Response
66
      * @return \Illuminate\Http\Response
67
      */
67
      */
68
-    public function show($id)
68
+    public function show(Customer $customer)
69
     {
69
     {
70
         //
70
         //
71
     }
71
     }
98
     /**
98
     /**
99
      * Remove the specified resource from storage.
99
      * Remove the specified resource from storage.
100
      *
100
      *
101
-     * @param  int  $id
101
+     * @param  Customer $customer
102
      * @return \Illuminate\Http\Response
102
      * @return \Illuminate\Http\Response
103
      */
103
      */
104
-    public function destroy($id)
104
+    public function destroy(Customer $customer)
105
     {
105
     {
106
         //
106
         //
107
     }
107
     }

+ 3
- 17
app/Http/Controllers/UserController.php Wyświetl plik

80
     public function show(User $user)
80
     public function show(User $user)
81
     {
81
     {
82
         return inertia('Users/Show', [
82
         return inertia('Users/Show', [
83
-            'user' => [
84
-                'id' => $user->id,
85
-                'name' => $user->name,
86
-                'username' => $user->username,
87
-                'role_id' => $user->role_id
88
-            ],
83
+            'user' => $user,
89
             'roles' => Role::whereNotIn('id', [1])
84
             'roles' => Role::whereNotIn('id', [1])
90
                 ->get()
85
                 ->get()
91
                 ->transform(fn($role) => [
86
                 ->transform(fn($role) => [
104
     public function edit(User $user)
99
     public function edit(User $user)
105
     {
100
     {
106
         return inertia('Users/Edit', [
101
         return inertia('Users/Edit', [
107
-            'user' => [
108
-                'id' => $user->id,
109
-                'name' => $user->name,
110
-                'username' => $user->username,
111
-                'role_id' => $user->role_id
112
-            ],
102
+            'user' => $user,
113
             'roles' => Role::whereNotIn('id', [1])
103
             'roles' => Role::whereNotIn('id', [1])
114
                 ->get()
104
                 ->get()
115
                 ->transform(fn($role) => [
105
                 ->transform(fn($role) => [
128
      */
118
      */
129
     public function update(UpdateUserRequest $request, User $user)
119
     public function update(UpdateUserRequest $request, User $user)
130
     {
120
     {
131
-        $user->update([
132
-            'name' => $request->name,
133
-            'username' => $request->username,
134
-            'role_id' => $request->role_id
135
-        ]);
121
+        $user->update($request->validated());
136
 
122
 
137
         return back()->with('success', __('messages.success.update.user'));
123
         return back()->with('success', __('messages.success.update.user'));
138
     }
124
     }

+ 2
- 0
app/Models/User.php Wyświetl plik

31
      * @var array<int, string>
31
      * @var array<int, string>
32
      */
32
      */
33
     protected $hidden = [
33
     protected $hidden = [
34
+        'created_at',
35
+        'updated_at',
34
         'password',
36
         'password',
35
         'remember_token'
37
         'remember_token'
36
     ];
38
     ];

+ 2
- 2
public/js/resources_js_pages_Customers_Edit_vue.js Wyświetl plik

883
   "class": "col-12 lg:col-8"
883
   "class": "col-12 lg:col-8"
884
 };
884
 };
885
 
885
 
886
-var _hoisted_3 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createTextVNode)(" Tambah Pelanggan ");
886
+var _hoisted_3 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createTextVNode)(" Ubah Pelanggan ");
887
 
887
 
888
 var _hoisted_4 = {
888
 var _hoisted_4 = {
889
   "class": "grid"
889
   "class": "grid"
909
   var _component_Card = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)("Card");
909
   var _component_Card = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveComponent)("Card");
910
 
910
 
911
   return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)(vue__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["Head"], {
911
   return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)(vue__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["Head"], {
912
-    title: "Tambah Pelanggan"
912
+    title: "Ubah Pelanggan"
913
   }), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["DashboardLayout"], null, {
913
   }), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["DashboardLayout"], null, {
914
     "default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
914
     "default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
915
       return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_1, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_2, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Card, null, {
915
       return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_1, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_2, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Card, null, {

+ 2
- 2
public/js/resources_js_pages_Customers_Index_vue.js Wyświetl plik

990
   var _directive_tooltip = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveDirective)("tooltip");
990
   var _directive_tooltip = (0,vue__WEBPACK_IMPORTED_MODULE_0__.resolveDirective)("tooltip");
991
 
991
 
992
   return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)(vue__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["Head"], {
992
   return (0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementBlock)(vue__WEBPACK_IMPORTED_MODULE_0__.Fragment, null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["Head"], {
993
-    title: "Daftar User"
993
+    title: "Daftar Pelanggan"
994
   }), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["DashboardLayout"], null, {
994
   }), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["DashboardLayout"], null, {
995
     "default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
995
     "default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
996
       return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_DataTable, {
996
       return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_DataTable, {
1011
           }, null, 8
1011
           }, null, 8
1012
           /* PROPS */
1012
           /* PROPS */
1013
           , ["modelValue"])])]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_5, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppButtonLink"], {
1013
           , ["modelValue"])])]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("div", _hoisted_5, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppButtonLink"], {
1014
-            label: "Tambah User",
1014
+            label: "Tambah Pelanggan",
1015
             icon: "pi pi-pencil",
1015
             icon: "pi pi-pencil",
1016
             "class": "p-button-outlined",
1016
             "class": "p-button-outlined",
1017
             href: _ctx.route('customers.create')
1017
             href: _ctx.route('customers.create')

+ 1
- 1
public/js/vue.js Wyświetl plik

58537
 /******/ 		// This function allow to reference async chunks
58537
 /******/ 		// This function allow to reference async chunks
58538
 /******/ 		__webpack_require__.u = (chunkId) => {
58538
 /******/ 		__webpack_require__.u = (chunkId) => {
58539
 /******/ 			// return url for filenames based on template
58539
 /******/ 			// return url for filenames based on template
58540
-/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"9296b829a7757dee","resources_js_pages_Auth_Login_vue":"8e53429f130c83f5","resources_js_pages_Customers_Create_vue":"1ec93aefdbb7bac8","resources_js_pages_Customers_Edit_vue":"47650583b348b8eb","resources_js_pages_Customers_Index_vue":"527935b3268e6218","resources_js_pages_Customers_tableHeader_js":"7a40a3d5ad60171c","resources_js_pages_Dashboards_Index_vue":"7f4150c836fe81d8","resources_js_pages_Purchases_Index_vue":"41fddd7f79c7a85d","resources_js_pages_Sales_Index_vue":"1da65c4ce926abbc","resources_js_pages_StockProducts_Index_vue":"74a65be5ec079b3f","resources_js_pages_Suppliers_Index_vue":"0f2fb6e79fdbec94","resources_js_pages_Users_Create_vue":"290f8cea7ecbd8da","resources_js_pages_Users_Edit_vue":"4f8b3ff98efb4ef3","resources_js_pages_Users_Index_vue":"575b2403097c7e16","resources_js_pages_Users_Show_vue":"5561027a65c32ca4","resources_js_pages_Users_tableHeader_js":"48f19bd820caf015"}[chunkId] + "";
58540
+/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"9296b829a7757dee","resources_js_pages_Auth_Login_vue":"8e53429f130c83f5","resources_js_pages_Customers_Create_vue":"1ec93aefdbb7bac8","resources_js_pages_Customers_Edit_vue":"31ae025a81e11ec5","resources_js_pages_Customers_Index_vue":"e46ee9e1139b2c88","resources_js_pages_Customers_tableHeader_js":"7a40a3d5ad60171c","resources_js_pages_Dashboards_Index_vue":"7f4150c836fe81d8","resources_js_pages_Purchases_Index_vue":"41fddd7f79c7a85d","resources_js_pages_Sales_Index_vue":"1da65c4ce926abbc","resources_js_pages_StockProducts_Index_vue":"74a65be5ec079b3f","resources_js_pages_Suppliers_Index_vue":"0f2fb6e79fdbec94","resources_js_pages_Users_Create_vue":"290f8cea7ecbd8da","resources_js_pages_Users_Edit_vue":"4f8b3ff98efb4ef3","resources_js_pages_Users_Index_vue":"575b2403097c7e16","resources_js_pages_Users_Show_vue":"5561027a65c32ca4","resources_js_pages_Users_tableHeader_js":"48f19bd820caf015"}[chunkId] + "";
58541
 /******/ 		};
58541
 /******/ 		};
58542
 /******/ 	})();
58542
 /******/ 	})();
58543
 /******/ 	
58543
 /******/ 	

+ 2
- 2
resources/js/pages/Customers/Edit.vue Wyświetl plik

23
 </script>
23
 </script>
24
 
24
 
25
 <template>
25
 <template>
26
-  <Head title="Tambah Pelanggan" />
26
+  <Head title="Ubah Pelanggan" />
27
 
27
 
28
   <DashboardLayout>
28
   <DashboardLayout>
29
     <div class="grid">
29
     <div class="grid">
30
       <div class="col-12 lg:col-8">
30
       <div class="col-12 lg:col-8">
31
         <Card>
31
         <Card>
32
-          <template #title> Tambah Pelanggan </template>
32
+          <template #title> Ubah Pelanggan </template>
33
           <template #content>
33
           <template #content>
34
             <div class="grid">
34
             <div class="grid">
35
               <div class="col-12 md:col-6">
35
               <div class="col-12 md:col-6">

+ 2
- 2
resources/js/pages/Customers/Index.vue Wyświetl plik

24
 </script>
24
 </script>
25
 
25
 
26
 <template>
26
 <template>
27
-  <Head title="Daftar User" />
27
+  <Head title="Daftar Pelanggan" />
28
 
28
 
29
   <DashboardLayout>
29
   <DashboardLayout>
30
     <DataTable
30
     <DataTable
52
             class="col-12 md:col-4 flex flex-column md:flex-row justify-content-end"
52
             class="col-12 md:col-4 flex flex-column md:flex-row justify-content-end"
53
           >
53
           >
54
             <AppButtonLink
54
             <AppButtonLink
55
-              label="Tambah User"
55
+              label="Tambah Pelanggan"
56
               icon="pi pi-pencil"
56
               icon="pi pi-pencil"
57
               class="p-button-outlined"
57
               class="p-button-outlined"
58
               :href="route('customers.create')"
58
               :href="route('customers.create')"