adjust deliveries by customer
This commit is contained in:
@@ -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,
|
||||
];
|
||||
|
||||
@@ -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()),
|
||||
];
|
||||
|
||||
|
||||
26
app/Http/Requests/Admin/Shop/StoreCustomerPost.php
Normal file
26
app/Http/Requests/Admin/Shop/StoreCustomerPost.php
Normal file
@@ -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',
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user