diff --git a/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php b/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php index ac36fe7f2..11fe6054f 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/OrdersController.php @@ -5,7 +5,7 @@ namespace Webkul\Customer\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; use Webkul\Customer\Repositories\CustomerRepository; - +use Webkul\Sales\Repositories\OrderRepository; use Auth; /** @@ -26,26 +26,18 @@ class OrdersController extends Controller */ protected $_config; protected $customer; + protected $order; - public function __construct(CustomerRepository $customer) + public function __construct(CustomerRepository $customer ,OrderRepository $order) { $this->middleware('customer'); $this->_config = request('_config'); $this->customer = $customer; - } - /** - * For taking the customer - * to the dashboard after - * authentication - * @return view - */ - private function getCustomer($id) { - $customer = collect($this->customer->findOneWhere(['id'=>$id])); - return $customer; + $this->order = $order; } public function index() { @@ -60,9 +52,9 @@ class OrdersController extends Controller $id = auth()->guard('customer')->user()->id; - $order = $this->customer->with('customerOrder')->findOneWhere(['id'=>$id]); + $orders = $this->order->customerOrder($id); - return view($this->_config['view'],compact('order')); + return view($this->_config['view'],compact('orders')); } } diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index 94c8b23d4..bb6589d57 100644 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -38,14 +38,4 @@ class Customer extends Authenticatable { return $this->belongsTo(CustomersGroups::class); } - - /** - * Get the customer order. - */ - public function customerOrder() - { - return $this->hasMany(Order::class); - } - - } diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index d72e8c86e..a6dff9956 100644 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -71,7 +71,7 @@ class OrderRepository extends Repository public function create(array $data) { DB::beginTransaction(); - + try { Event::fire('checkout.order.save.before', $data); @@ -97,7 +97,7 @@ class OrderRepository extends Repository $order->payment()->create($data['payment']); $order->addresses()->create($data['shipping_address']); - + $order->addresses()->create($data['billing_address']); foreach($data['items'] as $item) { @@ -114,7 +114,7 @@ class OrderRepository extends Repository throw $e; } - + DB::commit(); Event::fire('checkout.order.save.after', $order); @@ -180,4 +180,13 @@ class OrderRepository extends Repository return $order; } + + /** + * @param int $customerId + * @return void + */ + public function customerOrder($customerId) + { + return $this->model->where('customer_id',$customerId)->get(); + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue index 4da1276ac..96c3aca5e 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue @@ -5,7 +5,7 @@ v-if="haveChildren && item.parent_id != null"> + v-if="haveChildren" @click="showOrHide">