adjust deliveries by customer

app/Http/Controllers/Shop/HomeController.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Shop;
 
 use App\Http\Controllers\Controller;
 use App\Repositories\Shop\Articles;
-use App\Repositories\Shop\Homepages;
+use App\Repositories\Shop\Contents;
 use App\Repositories\Shop\TagGroups;
 use Illuminate\Http\Request;
 
@@ -15,7 +15,7 @@ class HomeController extends Controller
         $data = [
             'display_by_rows' => $request->input('by_rows') ?? false,
             'shelves' => Articles::getArticlesByHomepage(),
-            'text' => Homepages::getHomepage(),
+            'text' => Contents::getHomepage(),
             'tags' => TagGroups::getWithTagsAndCountOffers(),
             'no_filter' => true,
         ];

app/Http/Controllers/Shop/OrderController.php

@@ -44,7 +44,8 @@ class OrderController extends Controller
             $data = [
                 'customer' => $customer ? $customer->toArray() : false,
                 'basket' => Baskets::getBasketTotal(),
-                'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
+                // 'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
+                'deliveries' => Deliveries::getByCustomer()->toArray(),
                 'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()),
             ];
 

app/Http/Requests/Admin/Shop/StoreCustomerPost.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Requests\Admin\Shop;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreCustomerPost extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'first_name' => 'required',
+            'last_name' => 'required',
+            'email' => 'required',
+            'address' => 'required',
+            'zipcode' => 'required',
+            'city' => 'required',
+            'sale_channels[]' => 'required',
+        ];
+    }
+}

app/Repositories/Shop/Deliveries.php

@@ -19,15 +19,15 @@ class Deliveries
 
     public static function getByCustomer($customerId = false)
     {
-        $customer = Customers::get($customerId);
-        $saleChannels = $customer->sale_channels->pluck('id')->toArray();
+        $customer = $customerId ? Customers::get($customerId) : Customers::getAuth();
+        $saleChannels = $customer ? $customer->sale_channels->pluck('id')->toArray() : false;
 
-        return self::getBySaleChannels($saleChannels);
+        return $saleChannels ? self::getBySaleChannels($saleChannels) : false;
     }
 
     public static function getBySaleChannels($saleChannels)
     {
-        return Delivery::bySaleChannels($saleChannels)->get();
+        return Delivery::bySaleChannels($saleChannels)->with('sale_channel')->get();
     }
 
     public static function getSaleChannelId($deliveryId)

resources/views/Admin/Shop/ArticleNatures/form.blade.php

@@ -59,6 +59,8 @@
 @include('load.form.save')
 
 @push('js')
+    {!! JsValidator::formRequest('App\Http\Requests\Admin\Shop\StoreArticleNaturePost', '#article_nature-form') !!}
+
     <script>
         $(function() {
             initEditor();

resources/views/Admin/Shop/Customers/create.blade.php

@@ -1,11 +1,9 @@
 @extends('layout.index', [
     'title' => __('shop.customers.title'),
     'subtitle' => __('shop.customers.add'),
-	'breadcrumb' => [__('shop.customers.title')]
+    'breadcrumb' => [__('shop.customers.title')],
 ])
 
 @section('content')
-	{{ Form::open(['route' => 'Admin.Shop.Customers.store', 'id' => 'customer-form', 'autocomplete' => 'off']) }}
     @include('Admin.Shop.Customers.form')
-	</form>
 @endsection

resources/views/Admin/Shop/Customers/edit.blade.php

@@ -1,14 +1,9 @@
 @extends('layout.index', [
     'title' => __('shop.customers.title'),
     'subtitle' => __('shop.customers.edit'),
-	'breadcrumb' => [__('shop.customers.title')]
+    'breadcrumb' => [__('shop.customers.title')],
 ])
 
 @section('content')
-
-	{{ Form::open(['route' => 'Admin.Shop.Customers.store', 'id' => 'customer-form', 'autocomplete' => 'off']) }}
-		<input type="hidden" name="id" value="{{ $customer['id'] }}">
     @include('Admin.Shop.Customers.form')
-	</form>
-
 @endsection

resources/views/Admin/Shop/Customers/form.blade.php

@@ -1,3 +1,6 @@
+f{{ Form::open(['route' => 'Admin.Shop.Customers.store', 'id' => 'customer-form', 'autocomplete' => 'off']) }}
+<input type="hidden" name="id" value="{{ $customer['id'] ?? false }}">
+
 <div class="row">
     <div class="col-6">
         <x-card>
@@ -116,6 +119,7 @@
         </x-layout.box-collapse>
     </div>
 </div>
+</form>
 
 <x-save />
 
@@ -123,6 +127,8 @@
 @include('load.form.select2')
 
 @push('js')
+    {!! JsValidator::formRequest('App\Http\Requests\Admin\Shop\StoreCustomerPost', '#customer-form') !!}
+
     <script>
         $(function() {
             initSelect2();