diff --git a/app/Http/Controllers/Bo/DashboardController.php b/app/Http/Controllers/Bo/DashboardController.php
index f0356834..da4eba66 100644
--- a/app/Http/Controllers/Bo/DashboardController.php
+++ b/app/Http/Controllers/Bo/DashboardController.php
@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Bo;
use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
class DashboardController extends Controller
{
diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php
new file mode 100644
index 00000000..23cedb37
--- /dev/null
+++ b/app/Http/Controllers/Bo/OrdersController.php
@@ -0,0 +1,47 @@
+get();
+ return view('bo.orders', compact('orders'));
+ }
+
+ public function changeStatus($reference) {
+ $order = Orders::where('reference', $reference)->first();
+ $order->status_id = $order->status_id + 1;
+ $order->save();
+
+ return redirect()->route('bo.orders')->with('success', "Changement de status enregistré pour la commande " . $order->reference . ".");
+ }
+
+ public function cancelOrder($reference) {
+ $order = Orders::where('reference', $reference)->first();
+ $order->status_id = 7;
+ $order->save();
+
+ return redirect()->route('bo.orders')->with('success', "La commande à été annulée.");
+ }
+
+ public function addProduct($orderReference, $productId, $quantity) {
+ $product = Products::findOrFail($productId);
+ $order = Orders::where('reference', $orderReference)->first();
+
+ $order->total = $order->total + (($product->price - $product->price_buy) * $quantity);
+ $orderProduct = new OrdersProducts();
+ $orderProduct->product_id = $product->id;
+ $orderProduct->order_id = $order->id;
+ $orderProduct->quantity = $quantity;
+ $orderProduct->save();
+
+
+ return redirect()->route('bo.orders')->with('success', "Le produit à été ajouté.");
+ }
+}
diff --git a/app/Http/Middleware/RedirectOldSlugs.php b/app/Http/Middleware/RedirectOldSlugs.php
index f17bdbd0..f6e9ee8f 100644
--- a/app/Http/Middleware/RedirectOldSlugs.php
+++ b/app/Http/Middleware/RedirectOldSlugs.php
@@ -22,18 +22,24 @@ class RedirectOldSlugs
$rangeSlug = $request->route('rangeSlug');
if ($productSlug !== null) {
- $productOldSlug = OldSlug::where('slug', $productSlug)->first();
- if ($productOldSlug) {
- $product = Products::where('id', $productOldSlug->product_id)->first();
- return redirect()->route('product', $product->slug);
+ $product = Products::where('slug', $productSlug)->first();
+ if (!$product) {
+ $productOldSlug = OldSlug::where('slug', $productSlug)->first();
+ if ($productOldSlug) {
+ $product = Products::where('id', $productOldSlug->product_id)->first();
+ return redirect()->route('product', $product->slug);
+ }
}
}
if ($rangeSlug !== null) {
- $rangeOldSlug = OldSlug::where('slug', $rangeSlug)->first();
- if ($rangeOldSlug) {
- $range = Ranges::where('id', $rangeOldSlug->range_id)->first();
- return redirect()->route('range', $range->slug);
+ $range = Ranges::where('slug', $rangeSlug)->first();
+ if (!$range) {
+ $rangeOldSlug = OldSlug::where('slug', $rangeSlug)->first();
+ if ($rangeOldSlug) {
+ $range = Ranges::where('id', $rangeOldSlug->range_id)->first();
+ return redirect()->route('range', $range->slug);
+ }
}
}
diff --git a/app/Models/Orders.php b/app/Models/Orders.php
new file mode 100644
index 00000000..d73ccaf4
--- /dev/null
+++ b/app/Models/Orders.php
@@ -0,0 +1,23 @@
+belongsToMany('App\Models\Products', 'orders_products', 'order_id', 'product_id')->withPivot('quantity');
+ }
+
+ public function status() {
+ return $this->belongsTo('App\Models\OrdersStatus', 'status_id');
+ }
+
+ public function user() {
+ return $this->belongsTo('App\Models\User', 'user_id');
+ }
+}
diff --git a/app/Models/OrdersProducts.php b/app/Models/OrdersProducts.php
new file mode 100644
index 00000000..97b5135e
--- /dev/null
+++ b/app/Models/OrdersProducts.php
@@ -0,0 +1,11 @@
+hasMany('App\Models\Orders', 'status_id');
+ }
+}
diff --git a/app/Models/Products.php b/app/Models/Products.php
index 3ed5a5cd..bc97da5f 100644
--- a/app/Models/Products.php
+++ b/app/Models/Products.php
@@ -4,10 +4,12 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
class Products extends Model
{
use HasFactory;
+ use SoftDeletes;
protected $table = "products";
@@ -18,4 +20,12 @@ class Products extends Model
public function old_slugs() {
return $this->hasMany('App\Model\OldSlug', 'product_id');
}
+
+ public function stats() {
+ return $this->hasMany('App\Models\Stats', 'product_id');
+ }
+
+ public function orders() {
+ return $this->belongsToMany('App\Models\Orders', 'orders_products', 'product_id', 'order_id')->withPivot('quantity');
+ }
}
diff --git a/app/Models/Stats.php b/app/Models/Stats.php
new file mode 100644
index 00000000..876aecf8
--- /dev/null
+++ b/app/Models/Stats.php
@@ -0,0 +1,17 @@
+belongsTo('App\Models\Products', 'product_id');
+ }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index bad987fb..921e6f1e 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -43,4 +43,8 @@ class User extends Authenticatable
protected $casts = [
'email_verified_at' => 'datetime',
];
+
+ public function orders() {
+ return $this->hasMany('App\Models\Orders', 'user_id');
+ }
}
diff --git a/database/migrations/2020_11_05_084142_create_products.php b/database/migrations/2020_11_05_084142_create_products.php
index 82874b34..c7abc1c2 100644
--- a/database/migrations/2020_11_05_084142_create_products.php
+++ b/database/migrations/2020_11_05_084142_create_products.php
@@ -19,13 +19,15 @@ class CreateProducts extends Migration
$table->text('description');
$table->string('picture')->nullable();
$table->float('price');
- $table->float('price_buy');
+ $table->float('price_buy')->nullable();
$table->unsignedBigInteger('stock');
$table->string('reference');
$table->string('slug');
$table->boolean('status');
$table->foreignId('range_id')->constrained('ranges');
+ $table->float('margin')->default(0);
$table->timestamps();
+ $table->softDeletes();
});
}
diff --git a/database/migrations/2020_11_09_113830_create_stats.php b/database/migrations/2020_11_09_113830_create_stats.php
new file mode 100644
index 00000000..b79533a3
--- /dev/null
+++ b/database/migrations/2020_11_09_113830_create_stats.php
@@ -0,0 +1,35 @@
+id();
+ $table->foreignId('product_id')->constrained('products');
+ $table->date('date');
+ $table->float('margin')->default(0);
+ $table->unsignedBigInteger('nb_sale')->default(0);
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('stats');
+ }
+}
diff --git a/database/migrations/2020_11_09_125215_create_orders_status.php b/database/migrations/2020_11_09_125215_create_orders_status.php
new file mode 100644
index 00000000..76a15710
--- /dev/null
+++ b/database/migrations/2020_11_09_125215_create_orders_status.php
@@ -0,0 +1,31 @@
+id();
+ $table->string('label');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('orders_status');
+ }
+}
diff --git a/database/migrations/2020_11_09_125304_create_orders.php b/database/migrations/2020_11_09_125304_create_orders.php
new file mode 100644
index 00000000..76f17310
--- /dev/null
+++ b/database/migrations/2020_11_09_125304_create_orders.php
@@ -0,0 +1,37 @@
+id();
+ $table->foreignId('user_id')->constrained('users');
+ $table->string('reference')->unique();
+ $table->date('date');
+ $table->string('commentaire')->nullable();
+ $table->float('total');
+ $table->foreignId('status_id')->constrained('orders_status');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('orders');
+ }
+}
diff --git a/database/migrations/2020_11_09_161858_create_orders_products.php b/database/migrations/2020_11_09_161858_create_orders_products.php
new file mode 100644
index 00000000..e417385f
--- /dev/null
+++ b/database/migrations/2020_11_09_161858_create_orders_products.php
@@ -0,0 +1,32 @@
+foreignId('product_id')->constrained('products');
+ $table->foreignId('order_id')->constrained('orders');
+ $table->unsignedInteger('quantity')->default(1);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('orders_products');
+ }
+}
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 986e475b..8836ab60 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -15,5 +15,6 @@ class DatabaseSeeder extends Seeder
{
$this->call(ContentSeeder::class);
$this->call(SettingsSeeder::class);
+ $this->call(OrdersStatusSeeder::class);
}
}
diff --git a/database/seeders/OrdersStatusSeeder.php b/database/seeders/OrdersStatusSeeder.php
new file mode 100644
index 00000000..087c40c3
--- /dev/null
+++ b/database/seeders/OrdersStatusSeeder.php
@@ -0,0 +1,47 @@
+label = "En attente";
+
+ $payee = new OrdersStatus();
+ $payee->label ="Payée";
+
+ $validee = new OrdersStatus();
+ $validee->label = "Validée";
+
+ $preparation = new OrdersStatus();
+ $preparation->label = "En cours de préparation";
+
+ $prete = new OrdersStatus();
+ $prete->label = "Prête";
+
+ $retiree = new OrdersStatus();
+ $retiree->label = "Retirée";
+
+ $annulee = new OrdersStatus();
+ $annulee->label = "Annulée";
+
+ // Ordre
+ $attente->save();
+ $payee->save();
+ $validee->save();
+ $preparation->save();
+ $prete->save();
+ $retiree->save();
+ $annulée->save();
+ }
+}
diff --git a/resources/views/bo/content/manage.blade.php b/resources/views/bo/content/manage.blade.php
index 0557cc16..8e377da5 100644
--- a/resources/views/bo/content/manage.blade.php
+++ b/resources/views/bo/content/manage.blade.php
@@ -33,7 +33,22 @@
@section('scripts')
+@endsection
diff --git a/resources/views/bo/products/create.blade.php b/resources/views/bo/products/create.blade.php
index 0cb22915..c6bd7dc2 100644
--- a/resources/views/bo/products/create.blade.php
+++ b/resources/views/bo/products/create.blade.php
@@ -68,7 +68,22 @@
@section('scripts')