Add coupons, newsletter, country-based shipping, sale prices, USP bar
Deploy to Production (witstore.wende.it) / deploy (push) Successful in 8s
Deploy to Production (witstore.wende.it) / deploy (push) Successful in 8s
- Gutscheincodes: DB-Verwaltung (%, €-Rabatt, Mindestbestellwert, Ablauf), Eingabefeld im Checkout, Admin unter Marketing → Gutscheine - Newsletter: Double-Opt-In per E-Mail, Formular im Footer, Admin-Liste mit CSV-Export - Länderzonen-Versand: DE / DACH / EU / WORLD, Versandkosten nach Lieferland dynamisch berechnet, Coupon-Rabatt in Bestellung gespeichert - Sale-Preise: sale_price auf Produkten, durchgestrichener UVP auf Produktkarte, Sonderangebote-Sektion auf Startseite - USP-Leiste auf Startseite: Versand, Zahlung, Rückgabe, Service Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,68 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Coupon;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class CouponController extends Controller
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$coupons = Coupon::orderByDesc('created_at')->get();
|
||||
return view('admin.coupons.index', compact('coupons'));
|
||||
}
|
||||
|
||||
public function create()
|
||||
{
|
||||
return view('admin.coupons.form');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
{
|
||||
$data = $request->validate([
|
||||
'code' => 'required|string|max:50|unique:coupons,code',
|
||||
'type' => 'required|in:percent,fixed',
|
||||
'value' => 'required|numeric|min:0.01',
|
||||
'min_order_value' => 'nullable|numeric|min:0',
|
||||
'expires_at' => 'nullable|date',
|
||||
'max_uses' => 'nullable|integer|min:1',
|
||||
'active' => 'boolean',
|
||||
]);
|
||||
$data['code'] = strtoupper(trim($data['code']));
|
||||
$data['active'] = $request->boolean('active');
|
||||
|
||||
Coupon::create($data);
|
||||
return redirect()->route('admin.coupons.index')->with('success', 'Gutschein erstellt.');
|
||||
}
|
||||
|
||||
public function edit(Coupon $coupon)
|
||||
{
|
||||
return view('admin.coupons.form', compact('coupon'));
|
||||
}
|
||||
|
||||
public function update(Request $request, Coupon $coupon)
|
||||
{
|
||||
$data = $request->validate([
|
||||
'code' => 'required|string|max:50|unique:coupons,code,' . $coupon->id,
|
||||
'type' => 'required|in:percent,fixed',
|
||||
'value' => 'required|numeric|min:0.01',
|
||||
'min_order_value' => 'nullable|numeric|min:0',
|
||||
'expires_at' => 'nullable|date',
|
||||
'max_uses' => 'nullable|integer|min:1',
|
||||
'active' => 'boolean',
|
||||
]);
|
||||
$data['code'] = strtoupper(trim($data['code']));
|
||||
$data['active'] = $request->boolean('active');
|
||||
|
||||
$coupon->update($data);
|
||||
return redirect()->route('admin.coupons.index')->with('success', 'Gutschein aktualisiert.');
|
||||
}
|
||||
|
||||
public function destroy(Coupon $coupon)
|
||||
{
|
||||
$coupon->delete();
|
||||
return redirect()->route('admin.coupons.index')->with('success', 'Gutschein gelöscht.');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\NewsletterSubscriber;
|
||||
|
||||
class NewsletterController extends Controller
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$subscribers = NewsletterSubscriber::orderByDesc('created_at')->get();
|
||||
return view('admin.newsletter.index', compact('subscribers'));
|
||||
}
|
||||
|
||||
public function export()
|
||||
{
|
||||
$rows = NewsletterSubscriber::whereNotNull('confirmed_at')
|
||||
->orderBy('email')
|
||||
->pluck('email');
|
||||
|
||||
$csv = "E-Mail\n" . $rows->implode("\n");
|
||||
|
||||
return response($csv, 200, [
|
||||
'Content-Type' => 'text/csv; charset=UTF-8',
|
||||
'Content-Disposition' => 'attachment; filename="newsletter-' . date('Y-m-d') . '.csv"',
|
||||
]);
|
||||
}
|
||||
|
||||
public function destroy(NewsletterSubscriber $subscriber)
|
||||
{
|
||||
$subscriber->delete();
|
||||
return back()->with('success', 'Abonnent gelöscht.');
|
||||
}
|
||||
}
|
||||
@@ -39,6 +39,7 @@ class ProductController extends Controller
|
||||
'category_id' => 'nullable|exists:categories,id',
|
||||
'description' => 'nullable|string',
|
||||
'base_price' => 'required|numeric|min:0',
|
||||
'sale_price' => 'nullable|numeric|min:0',
|
||||
'tax_rate' => 'required|numeric|in:7,19',
|
||||
'weight' => 'nullable|numeric|min:0',
|
||||
'active' => 'boolean',
|
||||
@@ -83,6 +84,7 @@ class ProductController extends Controller
|
||||
'category_id' => 'nullable|exists:categories,id',
|
||||
'description' => 'nullable|string',
|
||||
'base_price' => 'required|numeric|min:0',
|
||||
'sale_price' => 'nullable|numeric|min:0',
|
||||
'tax_rate' => 'required|numeric|in:7,19',
|
||||
'weight' => 'nullable|numeric|min:0',
|
||||
'active' => 'boolean',
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Http\Controllers\Shop;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Coupon;
|
||||
use App\Models\ShippingRate;
|
||||
use App\Services\CartService;
|
||||
use App\Services\OrderService;
|
||||
@@ -21,12 +22,49 @@ class CheckoutController extends Controller
|
||||
return redirect()->route('cart.index')->with('error', 'Ihr Warenkorb ist leer.');
|
||||
}
|
||||
$subtotal = $this->cart->subtotal();
|
||||
$shippingRate = ShippingRate::forCart($subtotal);
|
||||
$country = session('checkout_country', 'DE');
|
||||
$shippingRate = ShippingRate::forCart($subtotal, $country);
|
||||
$shippingCost = $shippingRate ? $shippingRate->getCostForTotal($subtotal) : 0;
|
||||
$total = $subtotal + $shippingCost;
|
||||
$discount = $this->getCouponDiscount($subtotal);
|
||||
$total = max(0, $subtotal - $discount) + $shippingCost;
|
||||
$userAddresses = auth()->user()?->addresses ?? collect();
|
||||
$couponCode = session('coupon_code');
|
||||
|
||||
return view('shop.checkout.index', compact('subtotal', 'shippingCost', 'total', 'userAddresses'));
|
||||
return view('shop.checkout.index', compact('subtotal', 'shippingCost', 'total', 'userAddresses', 'discount', 'couponCode'));
|
||||
}
|
||||
|
||||
public function applyCoupon(Request $request)
|
||||
{
|
||||
$code = trim($request->input('coupon_code', ''));
|
||||
if (!$code) {
|
||||
return back()->with('coupon_error', 'Bitte Gutscheincode eingeben.');
|
||||
}
|
||||
$coupon = Coupon::findValid($code);
|
||||
if (!$coupon) {
|
||||
return back()->with('coupon_error', 'Gutscheincode ungültig oder abgelaufen.');
|
||||
}
|
||||
$subtotal = $this->cart->subtotal();
|
||||
if ($coupon->min_order_value && $subtotal < $coupon->min_order_value) {
|
||||
return back()->with('coupon_error', 'Mindestbestellwert von ' . number_format($coupon->min_order_value, 2, ',', '.') . ' € nicht erreicht.');
|
||||
}
|
||||
session(['coupon_code' => $coupon->code]);
|
||||
return back()->with('coupon_success', 'Gutschein "' . $coupon->code . '" angewendet!');
|
||||
}
|
||||
|
||||
public function removeCoupon()
|
||||
{
|
||||
session()->forget('coupon_code');
|
||||
return back()->with('coupon_success', 'Gutschein entfernt.');
|
||||
}
|
||||
|
||||
public function shippingCost(Request $request)
|
||||
{
|
||||
$country = strtoupper($request->input('country', 'DE'));
|
||||
session(['checkout_country' => $country]);
|
||||
$subtotal = $this->cart->subtotal();
|
||||
$shippingRate = ShippingRate::forCart($subtotal, $country);
|
||||
$cost = $shippingRate ? $shippingRate->getCostForTotal($subtotal) : 0;
|
||||
return response()->json(['cost' => $cost, 'formatted' => number_format($cost, 2, ',', '.') . ' €']);
|
||||
}
|
||||
|
||||
public function storeAddress(Request $request)
|
||||
@@ -83,10 +121,13 @@ class CheckoutController extends Controller
|
||||
if ($request->isMethod('get')) {
|
||||
$items = $this->cart->get();
|
||||
$subtotal = $this->cart->subtotal();
|
||||
$shippingRate = ShippingRate::forCart($subtotal);
|
||||
$country = $checkoutData['shipping']['country'] ?? $checkoutData['billing']['country'] ?? 'DE';
|
||||
$shippingRate = ShippingRate::forCart($subtotal, $country);
|
||||
$shippingCost = $shippingRate ? $shippingRate->getCostForTotal($subtotal) : 0;
|
||||
$total = $subtotal + $shippingCost;
|
||||
return view('shop.checkout.confirm', compact('checkoutData', 'items', 'subtotal', 'shippingCost', 'total'));
|
||||
$discount = $this->getCouponDiscount($subtotal);
|
||||
$total = max(0, $subtotal - $discount) + $shippingCost;
|
||||
$couponCode = session('coupon_code');
|
||||
return view('shop.checkout.confirm', compact('checkoutData', 'items', 'subtotal', 'shippingCost', 'total', 'discount', 'couponCode'));
|
||||
}
|
||||
|
||||
$order = $this->orderService->createFromSession(
|
||||
@@ -94,7 +135,7 @@ class CheckoutController extends Controller
|
||||
$checkoutData['payment_method']
|
||||
);
|
||||
|
||||
session()->forget('checkout_data');
|
||||
session()->forget(['checkout_data', 'checkout_country']);
|
||||
|
||||
return redirect()->route('checkout.thankyou', $order->order_number);
|
||||
}
|
||||
@@ -104,4 +145,15 @@ class CheckoutController extends Controller
|
||||
$order = \App\Models\Order::where('order_number', $order)->firstOrFail();
|
||||
return view('shop.checkout.thankyou', compact('order'));
|
||||
}
|
||||
|
||||
private function getCouponDiscount(float $subtotal): float
|
||||
{
|
||||
if ($code = session('coupon_code')) {
|
||||
$coupon = Coupon::findValid($code);
|
||||
if ($coupon) {
|
||||
return $coupon->calcDiscount($subtotal);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,12 +12,13 @@ class HomeController extends Controller
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$banners = Banner::where('active', true)->orderBy('sort_order')->get();
|
||||
$categories = Category::whereNull('parent_id')->where('active', true)->orderBy('sort_order')->get();
|
||||
$topProducts = Product::where('active', true)->where('featured', true)->latest()->take(8)->get();
|
||||
$newProducts = Product::where('active', true)->latest()->take(8)->get();
|
||||
$blogPosts = Page::where('type', 'blog')->where('published', true)->latest('published_at')->take(3)->get();
|
||||
$banners = Banner::where('active', true)->orderBy('sort_order')->get();
|
||||
$categories = Category::whereNull('parent_id')->where('active', true)->orderBy('sort_order')->get();
|
||||
$topProducts = Product::where('active', true)->where('featured', true)->with('images','variants','category')->latest()->take(8)->get();
|
||||
$newProducts = Product::where('active', true)->with('images','variants','category')->latest()->take(8)->get();
|
||||
$saleProducts = Product::where('active', true)->whereNotNull('sale_price')->with('images','variants','category')->latest()->take(8)->get();
|
||||
$blogPosts = Page::where('type', 'blog')->where('published', true)->latest('published_at')->take(3)->get();
|
||||
|
||||
return view('shop.home', compact('banners', 'categories', 'topProducts', 'newProducts', 'blogPosts'));
|
||||
return view('shop.home', compact('banners', 'categories', 'topProducts', 'newProducts', 'saleProducts', 'blogPosts'));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Shop;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\NewsletterSubscriber;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class NewsletterController extends Controller
|
||||
{
|
||||
public function subscribe(Request $request)
|
||||
{
|
||||
$request->validate(['newsletter_email' => 'required|email|max:255']);
|
||||
$email = strtolower($request->input('newsletter_email'));
|
||||
|
||||
$existing = NewsletterSubscriber::where('email', $email)->first();
|
||||
|
||||
if ($existing && $existing->isConfirmed()) {
|
||||
return back()->with('newsletter_info', 'Diese E-Mail-Adresse ist bereits angemeldet.');
|
||||
}
|
||||
|
||||
$token = Str::random(64);
|
||||
|
||||
if ($existing) {
|
||||
$existing->update(['token' => $token]);
|
||||
} else {
|
||||
NewsletterSubscriber::create(['email' => $email, 'token' => $token]);
|
||||
}
|
||||
|
||||
$confirmUrl = route('newsletter.confirm', $token);
|
||||
$shopName = \App\Models\Setting::get('shop_name', 'Shop');
|
||||
|
||||
Mail::raw(
|
||||
"Bitte bestätigen Sie Ihre Newsletter-Anmeldung:\n\n{$confirmUrl}\n\n"
|
||||
. "Falls Sie sich nicht angemeldet haben, können Sie diese E-Mail ignorieren.\n\n"
|
||||
. "– {$shopName}",
|
||||
fn($m) => $m->to($email)->subject("Newsletter-Anmeldung bestätigen – {$shopName}")
|
||||
);
|
||||
|
||||
return back()->with('newsletter_success', 'Bitte prüfen Sie Ihren Posteingang und bestätigen Sie die Anmeldung.');
|
||||
}
|
||||
|
||||
public function confirm(string $token)
|
||||
{
|
||||
$subscriber = NewsletterSubscriber::where('token', $token)->whereNull('confirmed_at')->first();
|
||||
|
||||
if (!$subscriber) {
|
||||
return redirect('/')->with('error', 'Ungültiger oder bereits verwendeter Bestätigungslink.');
|
||||
}
|
||||
|
||||
$subscriber->update(['confirmed_at' => now(), 'token' => null]);
|
||||
|
||||
return redirect('/')->with('success', 'Newsletter-Anmeldung erfolgreich bestätigt!');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user