Merge branch 'main' into demo

Author: thecodeholic

README.md

@@ -1,7 +1,28 @@
 # Laravel E-commerce Website
+E-commerce application built with Laravel, Vue.js, Tailwind.css and Alpine.js. <br>
+
+> If you want to see every single step how this E-commerce application is build and learn how to build your own Full Stack applications, check my website [thecodeholic.com](https://thecodeholic.com)
+
+## Demo
+Admin Panel: https://admin.lcommerce.net
+```
+Email: admin@example.com
+Password: admin123
+```
+
+Website: https://lcommerce.net
+
+```
+Email: user1@example.com
+Password: useruser1
+
+
+Email: user2@example.com
+Password: useruser2
+```
 
 ## Installation 
-Make sure you have environment setup properly. You will need MySQL, PHP8.1 and composer.
+Make sure you have environment setup properly. You will need MySQL, PHP8.1, Node.js and composer.
 
 ### Install Laravel Website + API
 1. Download the project (or clone using GIT)

app/Console/Commands/DeleteUnpaidOrders.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Order;
+use Illuminate\Console\Command;
+
+class DeleteUnpaidOrders extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'delete:unpaid-orders {hours=24}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete unpaid orders after x amount of hours';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $hours = $this->argument('hours');
+        $count = Order::deleteUnpaidOrders($hours);
+        $this->info("$count unpaid orders were deleted");
+        return Command::SUCCESS;
+    }
+}

app/Http/Controllers/Api/CategoryController.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\StoreCategoryRequest;
+use App\Http\Requests\UpdateCategoryRequest;
+use App\Http\Resources\CategoryResource;
+use App\Http\Resources\CategoryTreeResource;
+use App\Models\Category;
+
+class CategoryController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $sortField = request('sort_field', 'updated_at');
+        $sortDirection = request('sort_direction', 'desc');
+
+        $categories = Category::query()
+            ->orderBy($sortField, $sortDirection)
+            ->latest()
+            ->get();
+
+        return CategoryResource::collection($categories);
+    }
+
+    public function getAsTree()
+    {
+        return Category::getActiveAsTree(CategoryTreeResource::class);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(StoreCategoryRequest $request)
+    {
+        $data = $request->validated();
+        $data['created_by'] = $request->user()->id;
+        $data['updated_by'] = $request->user()->id;
+        $category = Category::create($data);
+
+        return new CategoryResource($category);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(UpdateCategoryRequest $request, Category $category)
+    {
+        $data = $request->validated();
+        $data['updated_by'] = $request->user()->id;
+        $category->update($data);
+
+        return new CategoryResource($category);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(Category $category)
+    {
+        $category->delete();
+
+        return response()->noContent();
+    }
+}

app/Http/Controllers/Api/CustomerController.php

@@ -14,6 +14,7 @@
 use App\Models\CustomerAddress;
 use http\Env\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class CustomerController extends Controller
 {
@@ -30,15 +31,14 @@ public function index()
         $sortDirection = request('sort_direction', 'desc');
 
         $query = Customer::query()
-            ->orderBy("customers.$sortField", $sortDirection)
-        ;
+            ->with('user')
+            ->orderBy("customers.$sortField", $sortDirection);
         if ($search) {
             $query
                 ->where(DB::raw("CONCAT(first_name, ' ', last_name)"), 'like', "%{$search}%")
                 ->join('users', 'customers.user_id', '=', 'users.id')
                 ->orWhere('users.email', 'like', "%{$search}%")
-                ->orWhere('customers.phone', 'like', "%{$search}%")
-            ;
+                ->orWhere('customers.phone', 'like', "%{$search}%");
         }
 
         $paginator = $query->paginate($perPage);
@@ -72,23 +72,34 @@ public function update(CustomerRequest $request, Customer $customer)
         $shippingData = $customerData['shippingAddress'];
         $billingData = $customerData['billingAddress'];
 
-        $customer->update($customerData);
+        DB::beginTransaction();
+        try {
+            $customer->update($customerData);
 
-        if ($customer->shippingAddress) {
-            $customer->shippingAddress->update($shippingData);
-        } else {
-            $shippingData['customer_id'] = $customer->user_id;
-            $shippingData['type'] = AddressType::Shipping->value;
-            CustomerAddress::create($shippingData);
-        }
-        if ($customer->billingAddress) {
-            $customer->billingAddress->update($billingData);
-        } else {
-            $billingData['customer_id'] = $customer->user_id;
-            $billingData['type'] = AddressType::Billing->value;
-            CustomerAddress::create($billingData);
+            if ($customer->shippingAddress) {
+                $customer->shippingAddress->update($shippingData);
+            } else {
+                $shippingData['customer_id'] = $customer->user_id;
+                $shippingData['type'] = AddressType::Shipping->value;
+                CustomerAddress::create($shippingData);
+            }
+
+            if ($customer->billingAddress) {
+                $customer->billingAddress->update($billingData);
+            } else {
+                $billingData['customer_id'] = $customer->user_id;
+                $billingData['type'] = AddressType::Billing->value;
+                CustomerAddress::create($billingData);
+            }
+        } catch (\Exception $e) {
+            DB::rollBack();
+
+            Log::critical(__METHOD__ . ' method does not work. '. $e->getMessage());
+            throw $e;
         }
 
+        DB::commit();
+
         return new CustomerResource($customer);
     }
 

app/Http/Controllers/Api/OrderController.php

@@ -11,6 +11,7 @@
 use App\Models\Api\Product;
 use App\Models\Order;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Mail;
 
 class OrderController extends Controller
@@ -28,6 +29,8 @@ public function index()
         $sortDirection = request('sort_direction', 'desc');
 
         $query = Order::query()
+            ->withCount('items')
+            ->with('user.customer')
             ->where('id', 'like', "%{$search}%")
             ->orderBy($sortField, $sortDirection)
             ->paginate($perPage);
@@ -37,6 +40,8 @@ public function index()
 
     public function view(Order $order)
     {
+        $order->load('items.product');
+
         return new OrderResource($order);
     }
 
@@ -47,10 +52,27 @@ public function getStatuses()
 
     public function changeStatus(Order $order, $status)
     {
-        $order->status = $status;
-        $order->save();
+        DB::beginTransaction();
+        try {
+            $order->status = $status;
+            $order->save();
+
+            if ($status === OrderStatus::Cancelled->value) {
+                foreach ($order->items as $item) {
+                    $product = $item->product;
+                    if ($product && $product->quantity !== null) {
+                        $product->quantity += $item->quantity;
+                        $product->save();
+                    }
+                }
+            }
+            Mail::to($order->user)->send(new OrderUpdateEmail($order));
+        } catch (\Exception $e) {
+            DB::rollBack();
+            throw $e;
+        }
 
-        Mail::to($order->user)->send(new OrderUpdateEmail($order));
+        DB::commit();
 
         return response('', 200);
     }