Fix on addresses

app/Http/Controllers/Shop/BasketController.php

@@ -16,7 +16,8 @@ class BasketController extends Controller
     {
         $offerId = $request->input('offer_id');
         $quantity = $request->input('quantity') ?? 1;
-        $price = Offers::getPrice($offerId, $quantity)->price_taxed;
+        $offer = Offers::getPrice($offerId, $quantity);
+        $price = $offer ? $offer->price_taxed : 0;
 
         return number_format($quantity * $price, 2);
     }

app/Http/Controllers/Shop/CustomerController.php

@@ -2,16 +2,19 @@
 
 namespace App\Http\Controllers\Shop;
 
-use App\Http\Controllers\Controller;
-use App\Repositories\Shop\Customers;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+use App\Repositories\Shop\Customers;
 use Illuminate\Support\Facades\Auth;
 
 class CustomerController extends Controller
 {
     public function profile($id = false)
     {
-        return view('Shop.Customers.profile', Customers::editProfile($id));
+        $data = Customers::editProfile($id);
+
+        return view('Shop.Customers.profile', $data);
     }
 
     public function modalProfile($id = false)
@@ -23,15 +26,27 @@ class CustomerController extends Controller
 
     public function edit()
     {
-        return view('Shop.Customers.edit', [
-            'customer' => Customers::getArray(Auth::id(), 'addresses'),
-        ]);
+        $id = Auth::id();
+        $data['customer'] = Customers::edit($id);
+
+        return view('Shop.Customers.edit', $data);
     }
 
     public function storeProfileAjax(Request $request)
     {
-        $customer = Customers::store($request->all());
+        $data = $request->all();
+        $customer = Customers::store($data);
 
         return response()->json(['error' => 0]);
     }
+
+    public function store(Request $request)
+    {
+        $data = $request->all();
+        dump($data);
+        exit;
+        $customer = Customers::storeFull($data);
+        
+        return response()->json(['error' => 0]);
+    }
 }

app/Http/Controllers/Shop/OrderController.php

@@ -8,6 +8,7 @@ use App\Repositories\Core\User\ShopCart;
 use App\Repositories\Shop\Baskets;
 use App\Repositories\Shop\Customers;
 use App\Repositories\Shop\Deliveries;
+use App\Repositories\Shop\DeliveryTypes;
 use App\Repositories\Shop\OrderMails;
 use App\Repositories\Shop\Orders;
 use App\Repositories\Shop\Paybox;
@@ -18,17 +19,19 @@ class OrderController extends Controller
 {
     public function index(OrdersDataTable $dataTable)
     {
-        return $dataTable->render('Shop.Orders.partials.list', $data ?? []);
+        return $dataTable->render('Shop.Orders.partials.list');
     }
 
     public function view($uuid)
     {
-        $data = Orders::getByUUID($uuid);
+        $data['order'] = Orders::view($uuid);
+        
+        return view('Shop.Orders.view', $data);
     }
 
     public function pdf($uuid)
     {
-        $data = Orders::getByUUID($uuid);
+        $data['order'] = Orders::getByUUID($uuid);
 
         return view('Shop.Orders.pdf', $data);
     }
@@ -43,6 +46,7 @@ class OrderController extends Controller
                 'basket' => ShopCart::getSummary(),
                 'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
                 'sale_channel' => SaleChannels::getDefault()->toArray(),
+                'delivery_types' => DeliveryTypes::getAll(),
             ];
 
             return view('Shop.Orders.order', $data);