refactor: query

app/Http/Controllers/PurchaseController.php

@@ -372,7 +372,7 @@ class PurchaseController extends Controller
                 ->withQueryString()
                 ->through(
                     fn($purchaseDetail) => [
-                        "createdAt" => $purchaseDetail->created_at,
+                        "updatedAt" => $purchaseDetail->updated_at,
                         "totalPrice" => FunctionService::rupiahFormat(
                             $purchaseDetail->price * $purchaseDetail->qty
                         ),
@@ -393,7 +393,7 @@ class PurchaseController extends Controller
                 ->get()
                 ->map(
                     fn($purchaseDetail) => [
-                        "createdAt" => $purchaseDetail->created_at,
+                        "updatedAt" => $purchaseDetail->updated_at,
                         "qty" => $purchaseDetail->qty,
                         "status" => $purchaseDetail->purchase->status,
                         "price" =>

app/Http/Controllers/SalesController.php

@@ -41,7 +41,7 @@ class SalesController extends Controller
                 ->through(
                     fn($sale) => [
                         "id" => $sale->id,
-                        "updatedAt" => $sale->updated_at,
+                        "createdAt" => $sale->created_at,
                         "name" => $sale->customer->name,
                         "phone" => $sale->customer->phone,
                         "email" => $sale->customer->email,

app/Http/Controllers/UserController.php

@@ -70,7 +70,12 @@ class UserController extends Controller
      */
     public function store(StoreUserRequest $request)
     {
-        User::create($request->validated());
+        $validated = $request
+            ->safe()
+            ->merge(["password" => bcrypt($request->username)])
+            ->all();
+
+        User::create($validated);
 
         return back()->with("success", __("messages.success.store.user"));
     }

app/Http/Requests/Company/StoreCompanyRequest.php

@@ -24,16 +24,11 @@ class StoreCompanyRequest extends FormRequest
     public function rules()
     {
         return [
-            "name" => "required|string|max:25",
-            "address" => "required|string",
-            "telephone" =>
-                "required|numeric|digits_between:10,15|unique:companies,telephone," .
-                $this->id,
-            "email" =>
-                "string|email|nullable|unique:companies,email," . $this->id,
-            "npwp" =>
-                "required|numeric|digits_between:15,20|unique:companies,npwp," .
-                $this->id,
+            "name" => "required|string|max:50",
+            "address" => "required|string|max:200",
+            "telephone" => "required|numeric|digits_between:4,20",
+            "email" => "string|email|nullable",
+            "npwp" => "required|numeric|digits_between:15,20",
         ];
     }
 }

app/Http/Requests/Customer/StoreCustomerRequest.php

@@ -25,9 +25,9 @@ class StoreCustomerRequest extends FormRequest
     {
         return [
             "name" => "required|string|max:50",
-            "address" => "required|string",
+            "address" => "required|string|max:200",
             "phone" =>
-                "required|numeric|digits_between:12,15|unique:customers,phone",
+                "required|numeric|digits_between:4,20|unique:customers,phone",
             "npwp" =>
                 "required|numeric|digits_between:15,20|unique:customers,npwp",
         ];

app/Http/Requests/Customer/UpdateCustomerRequest.php

@@ -25,9 +25,9 @@ class UpdateCustomerRequest extends FormRequest
     {
         return [
             "name" => "required|string|max:50",
-            "address" => "required|string",
+            "address" => "required|string|max:200",
             "phone" =>
-                "required|numeric|digits_between:12,15|unique:customers,phone," .
+                "required|numeric|digits_between:4,20|unique:customers,phone," .
                 $this->customer->id,
             "npwp" =>
                 "required|numeric|digits_between:15,20|unique:customers,npwp," .

app/Http/Requests/Product/StoreProductRequest.php

@@ -24,10 +24,10 @@ class StoreProductRequest extends FormRequest
     public function rules()
     {
         return [
-            "number" => "required|string|unique:products,number",
-            "name" => "required|string",
-            "unit" => "required|string",
-            "profit" => "numeric|digits_between:0,100",
+            "number" => "required|string",
+            "name" => "required|string|max:50",
+            "unit" => "required|string|max:25",
+            "profit" => "numeric|min:0|max:100",
         ];
     }
 }

app/Http/Requests/Product/UpdateProductRequest.php

@@ -26,9 +26,9 @@ class UpdateProductRequest extends FormRequest
         return [
             "number" =>
                 "required|string|unique:products,number," . $this->product->id,
-            "name" => "required|string",
-            "unit" => "required|string",
-            "profit" => "numeric|digits_between:0,100",
+            "name" => "required|string|max:50",
+            "unit" => "required|string|max:25",
+            "profit" => "numeric|min:0|max:100",
         ];
     }
 }

app/Http/Requests/Purchase/StorePurchaseRequest.php

@@ -26,9 +26,9 @@ class StorePurchaseRequest extends FormRequest
         return [
             "number" => "required|string|unique:sales,number",
             "status" => "required|string",
-            "ppn" => "required|boolean",
             "supplier_id" => "required|numeric",
             "products" => "required",
+            "ppn" => "required|boolean",
         ];
     }
 }

app/Http/Requests/Sales/StoreSaleRequest.php

@@ -24,11 +24,11 @@ class StoreSaleRequest extends FormRequest
     public function rules()
     {
         return [
-            "number" => "required|string|unique:sales,number",
+            "number" => "required|string",
             "status" => "required|string",
-            "ppn" => "required|boolean",
             "customer_id" => "required|numeric",
             "products" => "required",
+            "ppn" => "required|boolean",
         ];
     }
 }

app/Http/Requests/Sales/UpdateSaleRequest.php

@@ -24,9 +24,7 @@ class UpdateSaleRequest extends FormRequest
     public function rules()
     {
         return [
-            "status" => "required|string",
-            "products" => "required",
-            "ppn" => "required|boolean",
+            //
         ];
     }
 }

app/Http/Requests/Supplier/StoreSupplierRequest.php

@@ -25,10 +25,10 @@ class StoreSupplierRequest extends FormRequest
     {
         return [
             "name" => "required|string|max:50",
-            "address" => "required|string",
+            "address" => "required|string|:max:200",
             "email" => "string|email|nullable|unique:suppliers,email",
             "phone" =>
-                "required|numeric|digits_between:12,15|unique:suppliers,phone",
+                "required|numeric|digits_between:12,20|unique:suppliers,phone",
             "npwp" =>
                 "required|numeric|digits_between:15,20|unique:suppliers,npwp",
         ];

app/Http/Requests/Supplier/UpdateSupplierRequest.php

@@ -25,12 +25,12 @@ class UpdateSupplierRequest extends FormRequest
     {
         return [
             "name" => "required|string|max:50",
-            "address" => "required|string",
+            "address" => "required|string|max:200",
             "email" =>
                 "string|email|nullable|unique:suppliers,email," .
                 $this->supplier->id,
             "phone" =>
-                "required|numeric|digits_between:12,15|unique:suppliers,phone," .
+                "required|numeric|digits_between:12,20|unique:suppliers,phone," .
                 $this->supplier->id,
             "npwp" =>
                 "required|numeric|digits_between:15,20|unique:suppliers,npwp," .

app/Http/Requests/User/StoreUserRequest.php

@@ -26,7 +26,7 @@ class StoreUserRequest extends FormRequest
         return [
             "name" => "required|string|max:50",
             "username" =>
-                "required|string|regex:/^\S*$/u|min:5|unique:users,username",
+                "required|string|regex:/^\S*$/u|min:6|max:25|unique:users,username",
             "role_id" => "required|numeric",
         ];
     }

app/Http/Requests/User/UpdateUserRequest.php

@@ -26,7 +26,7 @@ class UpdateUserRequest extends FormRequest
         return [
             "name" => "required|string|max:50",
             "username" =>
-                "required|string|regex:/^\S*$/u|min:5|unique:users,username," .
+                "required|string|regex:/^\S*$/u|min:6|max:25|unique:users,username," .
                 $this->user->id,
             "role_id" => "required|numeric",
         ];

app/Models/Ppn.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 

app/Models/PurchaseDetail.php

@@ -14,7 +14,7 @@ class PurchaseDetail extends Model
 
     protected $fillable = ["price", "qty", "purchase_number", "product_number"];
 
-    protected function createdAt(): Attribute
+    protected function updatedAt(): Attribute
     {
         return Attribute::make(
             get: fn($value) => Carbon::parse($value)->translatedFormat(

app/Models/Sale.php

@@ -15,7 +15,7 @@ class Sale extends Model
 
     protected $with = ["saleDetail.product", "customer"];
 
-    protected function updatedAt(): Attribute
+    protected function createdAt(): Attribute
     {
         return Attribute::make(
             get: fn($value) => Carbon::parse($value)->translatedFormat(

app/Services/DashboardService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class DashboardService
@@ -35,22 +36,18 @@ class DashboardService
     {
         return [
             "data" => [
-                QueryService::amount(
-                    "sales",
-                    __("words.sale"),
-                    __("words.today")
-                ),
-                QueryService::amount(
+                self::amount("sales", __("words.sale"), __("words.today")),
+                self::amount(
                     "purchases",
                     __("words.purchase"),
                     __("words.today")
                 ),
-                QueryService::amount(
+                self::amount(
                     "products",
                     __("words.product"),
                     __("words.today")
                 ),
-                QueryService::amount(
+                self::amount(
                     "stock_products",
                     __("words.stock_product"),
                     __("words.today")
@@ -67,10 +64,8 @@ class DashboardService
                 "number" => now()->translatedFormat("Y"),
             ]),
             "data" => [
-                __("words.sale") => QueryService::amountStatistic("sales"),
-                __("words.purchase") => QueryService::amountStatistic(
-                    "purchases"
-                ),
+                __("words.sale") => self::amountStatistic("sales"),
+                __("words.purchase") => self::amountStatistic("purchases"),
             ],
         ];
     }
@@ -79,7 +74,7 @@ class DashboardService
     {
         return [
             "title" => __("words.sale"),
-            "data" => QueryService::priceStatistic("sale_details"),
+            "data" => self::priceStatistic("sale_details"),
         ];
     }
 
@@ -87,10 +82,72 @@ class DashboardService
     {
         return [
             "title" => __("words.purchase"),
-            "data" => QueryService::priceStatistic("purchase_details"),
+            "data" => self::priceStatistic("purchase_details"),
         ];
     }
 
+    public static function amount(
+        string $table,
+        string $title,
+        string $description
+    ) {
+        return DB::table($table)
+            ->selectRaw(
+                "COUNT(*) AS amount, (
+                 SELECT
+                    COUNT(*)
+                 FROM
+                    products
+                 WHERE
+                    DATE(created_at) = CURDATE()) AS amountToday"
+            )
+            ->get()
+            ->transform(
+                fn($table) => [
+                    "title" => $title,
+                    "amount" => $table->amount,
+                    "amountToday" => $table->amountToday,
+                    "amountTodayDescription" => $description,
+                ]
+            )
+            ->first();
+    }
+
+    public static function amountStatistic(string $table)
+    {
+        return DB::table($table)
+            ->selectRaw(
+                "COUNT(*) AS amount,
+                 DATE_FORMAT(created_at, '%b') AS month"
+            )
+            ->whereRaw("YEAR(created_at) = YEAR(CURDATE())")
+            ->groupByRaw("month")
+            ->orderByRaw("created_at")
+            ->get()
+            ->pluck("amount", "month");
+    }
+
+    public static function priceStatistic(string $table)
+    {
+        return DB::table($table)
+            ->selectRaw(
+                "price,
+                 created_at"
+            )
+            ->orderByRaw("created_at")
+            ->get()
+            ->groupBy([
+                fn($value) => Carbon::parse($value->created_at)->format("Y"),
+                fn($value) => Carbon::parse($value->created_at)->format("M"),
+            ])
+            ->take(2)
+            ->transform(
+                fn($year) => $year->transform(
+                    fn($month) => $month->sum(fn($arr) => $arr->price)
+                )
+            );
+    }
+
     public static function dump()
     {
         return dd(

app/Services/ProductService.php

@@ -3,7 +3,6 @@
 namespace App\Services;
 
 use App\Models\Product;
-use Illuminate\Support\Facades\DB;
 
 class ProductService
 {

app/Services/PurchaseService.php

@@ -3,7 +3,6 @@
 namespace App\Services;
 
 use App\Models\Purchase;
-use Illuminate\Support\Facades\DB;
 
 class PurchaseService
 {

app/Services/QueryService.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-
-class QueryService
-{
-    public static function amount(
-        string $table,
-        string $title,
-        string $description
-    ) {
-        return DB::table($table)
-            ->selectRaw(
-                "COUNT(*) AS amount, (
-                 SELECT
-                    COUNT(*)
-                 FROM
-                    products
-                 WHERE
-                    DATE(created_at) = CURDATE()) AS amountToday"
-            )
-            ->get()
-            ->transform(
-                fn($table) => [
-                    "title" => $title,
-                    "amount" => $table->amount,
-                    "amountToday" => $table->amountToday,
-                    "amountTodayDescription" => $description,
-                ]
-            )
-            ->first();
-    }
-
-    public static function amountStatistic(string $table)
-    {
-        return DB::table($table)
-            ->selectRaw(
-                "COUNT(*) AS amount,
-                 DATE_FORMAT(created_at, '%b') AS month"
-            )
-            ->whereRaw("YEAR(created_at) = YEAR(CURDATE())")
-            ->groupByRaw("month")
-            ->orderByRaw("created_at")
-            ->get()
-            ->pluck("amount", "month");
-    }
-
-    public static function priceStatistic(string $table)
-    {
-        return DB::table($table)
-            ->selectRaw(
-                "price,
-                 created_at"
-            )
-            ->orderByRaw("created_at")
-            ->get()
-            ->groupBy([
-                fn($value) => Carbon::parse($value->created_at)->format("Y"),
-                fn($value) => Carbon::parse($value->created_at)->format("M"),
-            ])
-            ->take(2)
-            ->transform(
-                fn($year) => $year->transform(
-                    fn($month) => $month->sum(fn($arr) => $arr->price)
-                )
-            );
-    }
-}

database/migrations/2022_04_20_031727_create_users_table.php

@@ -17,7 +17,7 @@ return new class extends Migration
             $table->id();
             $table->string('name');
             $table->string('username')->unique();
-            $table->string('password')->default(bcrypt('12345678'));
+            $table->string('password');
             $table->boolean('status')->default(true); // true(active) false(not active)
             $table->foreignId('role_id')->constrained();
             $table->rememberToken();

database/migrations/2022_07_20_094754_create_companies_table.php

@@ -17,10 +17,7 @@ return new class extends Migration {
             $table->string("name");
             $table->string("address");
             $table->string("telephone");
-            $table
-                ->string("email")
-                ->unique()
-                ->nullable();
+            $table->string("email")->nullable();
             $table->string("npwp");
             $table->timestamps();
         });

lang/id/validation.php

@@ -18,7 +18,7 @@ return [
     'active_url' => 'Nilai is not a valid URL.',
     'after' => 'Tanggal harus setelah tanggal :date.',
     'after_or_equal' => 'Tanggal harus setelah atau sama dengan :date.',
-    'alpha' => 'Nilai harus only contain letters.',
+    'alpha' => 'Nilai hanya boleh berisi huruf.',
     'alpha_dash' => 'Nilai harus only contain letters, numbers, dashes and underscores.',
     'alpha_num' => 'Nilai harus only contain letters and numbers.',
     'array' => 'Nilai harus be an array.',
@@ -79,7 +79,7 @@ return [
         'array' => 'Nilai harus not have more than :value items.',
     ],
     'max' => [
-        'numeric' => 'Nilai harus :max angka.',
+        'numeric' => 'Nilai maksimal harus :max angka.',
         'file' => 'Nilai harus not be greater than :max kilobytes.',
         'string' => 'Nilai harus :max karakter.',
         'array' => 'Nilai harus not have more than :max items.',
@@ -87,7 +87,7 @@ return [
     'mimes' => 'Harus berupa file dengan format: :values.',
     'mimetypes' => 'Nilai harus be a file of type: :values.',
     'min' => [
-        'numeric' => 'Nilai harus :min angka.',
+        'numeric' => 'Nilai minimal harus :min angka.',
         'file' => 'Nilai harus be at least :min kilobytes.',
         'string' => 'Nilai harus :min karakter.',
         'array' => 'Nilai harus have at least :min items.',

resources/js/pages/Dashboards/Components/CardCart.vue

@@ -1,19 +1,17 @@
 <script setup>
 defineProps({
-  title: {
-    type: String,
-  },
-  description: {
-    type: String,
+  data: {
+    required: true,
+    type: Object,
   },
 })
 </script>
 
 <template>
   <div class="card">
-    <h5 class="mb-1">{{ title }}</h5>
-    <span>{{ description }}</span>
+    <h5 class="mb-1">{{ data.title }}</h5>
+    <span>{{ data.description }}</span>
 
-    <Chart v-bind="$attrs" />
+    <Chart :type="$attrs.type" :data="data.data" />
   </div>
 </template>

resources/js/pages/Dashboards/Index.vue

@@ -41,12 +41,7 @@ const purchasePriceStatistic = useStatisticDualYear(
           </div>
 
           <div class="col-12">
-            <CardCart
-              type="line"
-              :title="salePurchaseAmountStatistic.title"
-              :description="salePurchaseAmountStatistic.description"
-              :data="salePurchaseAmountStatistic.data"
-            />
+            <CardCart type="line" :data="salePurchaseAmountStatistic" />
           </div>
         </div>
       </div>
@@ -54,21 +49,11 @@ const purchasePriceStatistic = useStatisticDualYear(
       <div class="col-12 xl:col-6">
         <div class="grid">
           <div class="col-12">
-            <CardCart
-              type="bar"
-              :title="salePriceStatistic.title"
-              :description="salePriceStatistic.description"
-              :data="salePriceStatistic.data"
-            />
+            <CardCart type="bar" :data="salePriceStatistic" />
           </div>
 
           <div class="col-12">
-            <CardCart
-              type="bar"
-              :title="purchasePriceStatistic.title"
-              :description="purchasePriceStatistic.description"
-              :data="purchasePriceStatistic.data"
-            />
+            <CardCart type="bar" :data="purchasePriceStatistic" />
           </div>
         </div>
       </div>

resources/js/pages/Purchases/config.js

@@ -39,7 +39,7 @@ export const cartTable = [
 ]
 
 export const reportTable = [
-  { field: 'createdAt', header: 'Tanggal' },
+  { field: 'updatedAt', header: 'Tanggal' },
   { field: 'totalPrice', header: 'Total Harga' },
   { field: 'qty', header: 'Kuantitas' },
   { field: 'status', header: 'Status' },

resources/js/pages/Sales/config.js

@@ -10,7 +10,7 @@ export const optionStatus = [
 ]
 
 export const indexTable = [
-  { field: 'updatedAt', header: 'Tanggal' },
+  { field: 'createdAt', header: 'Tanggal' },
   { field: 'name', header: 'Nama Pelanggan' },
   { field: 'phone', header: 'No HP Pelanggan' },
   { field: 'price', header: 'Total Harga' },

resources/js/pages/Settings/Components/Ppn.vue

@@ -16,13 +16,11 @@ const { state, setState } = useState()
 const onSubmit = () => {
   setState()
 
-  if (state.disable) {
-    if (!form.ppn) {
-      form.ppn = 0
-    }
-
-    form.post(route('ppn.store'))
+  if (!form.ppn) {
+    form.ppn = 0
   }
+
+  form.post(route('ppn.store'))
 }
 </script>
 

resources/js/pages/StockProducts/Index.vue

@@ -5,8 +5,8 @@ import AppPagination from '@/components/AppPagination.vue'
 import DashboardLayout from '@/layouts/Dashboard/DashboardLayout.vue'
 
 defineProps({
-  stockProducts: Object,
   initialFilters: Object,
+  stockProducts: Object,
 })
 </script>
 

resources/views/Excel/Purchases/Export.blade.php

@@ -5,9 +5,9 @@
         </tr>
         <tr>
             <th colspan="5" rowspan="2">{{ __('words.period', ['number' => '']) }}
-                {{ $purchases->first()['createdAt'] }}
+                {{ $purchases->first()['updatedAt'] }}
                 -
-                {{ $purchases->last()['createdAt'] }} </th>
+                {{ $purchases->last()['updatedAt'] }} </th>
         </tr>
         <tr></tr>
         <tr>
@@ -22,7 +22,7 @@
         @foreach ($purchases as $index => $purchase)
             <tr>
                 <td>{{ ++$index }}</td>
-                <td>{{ $purchase['createdAt'] }}</td>
+                <td>{{ $purchase['updatedAt'] }}</td>
                 <td>{{ $purchase['qty'] }}</td>
                 <td>{{ $purchase['status'] }}</td>
                 <td>{{ $purchase['price'] }}</td>