Skip to content

Commit

Permalink
before merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@prashant-webkul
prashant-webkul committed Sep 19, 2018
1 parent a122a8e commit a24c789
Show file tree
Hide file tree
Showing 21 changed files with 691 additions and 198 deletions.
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@section('page_title')

@endsection
@stop

@section('content')

Expand Down
136 changes: 91 additions & 45 deletions packages/Webkul/Cart/src/Cart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,74 +32,88 @@ class Cart {

protected $customer;

public function __construct(CartRepository $cart, CartProductRepository $cartProduct, CustomerRepository $customer) {
//Cookie expiry limit in minutes
protected $minutes = 150;

public function __construct(CartRepository $cart, CartProductRepository $cartProduct, CustomerRepository $customer ,$minutes = 150) {

$this->customer = $customer;

$this->cart = $cart;

$this->cartProduct = $cartProduct;

$this->minutes = $minutes;
}

public function guestUnitAdd($id) {

//empty array for storing the products
$products = array();

$minutes = 150;

if(Cookie::has('cart_session_id')) {

//getting the cart session id from cookie
$cart_session_id = Cookie::get('cart_session_id');

//finding current cart instance in the database table.
$current_cart = $this->cart->findOneByField('session_id', $cart_session_id);

// dd('Cookie = ',$cart_session_id, 'Session = ', session()->get('cart_session_id'), 'DB = ', $current_cart->session_id);

//check there is any cart or not
if(isset($current_cart)) {
$current_cart_id = $current_cart['id'] ?? $current_cart->id;

$current_cart_session_id = $current_cart['session_id'] ?? $current_cart->session_id;
} else {
//if someone deleted then take the flow to the normal
$this->repairCart($cart_session_id, $id);
}


//matching the session id present in the cookie and database are same or not.
if((session()->get('cart_session_id') == Cookie::get('cart_session_id')) && ($current_cart_session_id == session()->get('cart_session_id'))) {
$current_cart_products = array();

$current_cart_products = $this->cart->getProducts($current_cart_id);

//checking new product coming in the cart is new or previously added item.
foreach($current_cart_products as $key => $value) {

$product_id = $value['id'] ?? $value->id;

if($product_id == $id) {
//create status code to communicate with session flash
session()->flash('error', 'Item Already In Cart');

//remove this its temporary
dump('Item Already In Cart');

return redirect()->back();
}
}

//cart data being attached to the instace.
$cart_data = $this->cart->attach($current_cart_id, $id, 1);

//getting the products after being attached to cart instance
$cart_products = $this->cart->getProducts($current_cart_id);

//storing the information in session.
session()->put('cart_data', [$current_cart, $cart_products]);

session()->flash('Success', 'Item Added In Cart');
session()->flash('Success', 'Item Added To Cart Successfully');

dump($cart_products);

//return the control to the controller
return redirect()->back();

} else {
//repair the cart
//repair the cart, will remake the session
//and add the product in the new cart instance.
$this->repairCart($cart_session_id, $id);
}
} else {
//create a new cart instance.
//function call
$this->createNewCart($id);
}
}
Expand All @@ -112,23 +126,20 @@ public function guestUnitAdd($id) {
* Session.
*
* @return mixed
*/
*/

public function createNewCart($id) {
$minutes = 120;

$fresh_cart_session_id = session()->getId();

Cookie::queue('cart_session_id', $fresh_cart_session_id, $minutes);

$cart_session_id = $this->makeCartSession($fresh_cart_session_id);

$data['session_id'] = $fresh_cart_session_id;

$data['channel_id'] = core()->getCurrentChannel()->id;

if($cart = $this->cart->create($data)) {

$this->makeCartSession($fresh_cart_session_id);

$new_cart_id = $cart->id ?? $cart['id'];

$cart_product['product_id'] = $id;
Expand All @@ -141,7 +152,7 @@ public function createNewCart($id) {

session()->put('cart_data', [$cart, $cart_product]);

session()->flash('success', 'Product Added To Cart');
session()->flash('success', 'Item Added To Cart Successfully');

return redirect()->back();
}
Expand All @@ -156,9 +167,12 @@ public function createNewCart($id) {
* cart.
*/
public function makeCartSession($cart_session_id) {
session()->put('cart_session_id', $cart_session_id);

return session()->get('cart_session_id');
$fresh_cart_session_id = $cart_session_id;

Cookie::queue('cart_session_id', $fresh_cart_session_id, $this->minutes);

session()->put('cart_session_id', $fresh_cart_session_id);
}


Expand All @@ -170,8 +184,7 @@ public function makeCartSession($cart_session_id) {
*
* @return mixed
*/

public function repairCart($cart_session_id, $product_id) {
public function repairCart($cart_session_id ="null", $product_id = 0) {

if($cart_session_id == session()->get('cart_session_id')) {
$data['session_id'] = $cart_session_id;
Expand All @@ -184,7 +197,7 @@ public function repairCart($cart_session_id, $product_id) {

$this->cart->attach($cart_id, $product_id, 1);

session()->flash('success', 'Product Added In Cart');
session()->flash('success', 'Item Added To Cart Successfully');

return redirect()->back();

Expand Down Expand Up @@ -212,16 +225,16 @@ public function repairCart($cart_session_id, $product_id) {
public function guestUnitRemove($id) {

//remove the products here
if(Cookie::has('session_c')) {
$products = unserialize(Cookie::get('session_c'));
if(Cookie::has('session_cart_id')) {
$products = unserialize(Cookie::get('session_cart_id'));

foreach($products as $key => $value) {
if($value == $id) {
unset($products[$key]);

array_push($products, $id);

Cookie::queue('session_c', serialize($products));
Cookie::queue('session_cart_id', serialize($products));

return redirect()->back();
}
Expand All @@ -239,46 +252,80 @@ public function add($id) {

$products = array();

// $customerLoggedIn = auth()->guard('customer')->check();

// //customer is authenticated
// if ($customerLoggedIn) {
//assuming that there is data in cookie and customer's cart also.
if(!auth()->guard('customer')->check()) {
throw new \Exception('This function is protected for auth customers only.');
}

$data['customer_id'] = auth()->guard('customer')->user()->id;

$data['channel_id'] = core()->getCurrentChannel()->id;

$customerCart = $this->cart->findOneByField('customer_id', $data['customer_id']);
$customer_cart = $this->cart->findOneByField('customer_id', $data['customer_id']);

//if there are products already in cart of that customer.
$customerCartId = $customerCart->id ?? $customerCart['id'];
$customer_cart_id = $customer_cart->id ?? $customer_cart['id'];

$customerCartProducts = $this->cart->getProducts($customerCartId);
/**
* Check if their any
* instance of current
* customer in the cart
* table.
*/
if(isset($customer_cart)) {
$customer_cart_products = $this->cart->getProducts($customer_cart_id);

if (isset($customerCartProducts)) {
if (isset($customer_cart_products)) {

foreach ($customerCartProducts as $previousCartProduct) {
foreach ($customer_cart_products as $customer_cart_product) {
if($customer_cart_product->id == $id) {
dump('Item already exists in cart');

if($previousCartProduct->id == $id) {
dd('product already exists in cart');
session()->flash('error', 'Item already exists in cart');

session()->flash('error', 'Product already exists in cart');
return redirect()->back();

return redirect()->back();
//maybe increase the quantity in here
}
}
//add the product in the cart

$this->cart->attach($customer_cart_id, $id, 1);

session()->flash('success', 'Item Added To Cart Successfully');

return redirect()->back();
} else {
$this->cart->destroy($customer_cart_id);

session()->flash('error', 'Try Adding The Item Again');

dd('cart instance without any product found, delete it and create a new one for the current product id');

return redirect()->back();
}
//add the product in the cart
} else {
/**
* this will work
* for logged in users
* and they do not have
* any cart instance
* found in the database.
*/

$product['product_id'] = $id;
if($new_cart = $this->cart->create($data)) {
$new_cart_id = $new_cart->id ?? $new_cart['id'];

$product['quantity'] = 1;
$this->cart->attach($new_cart_id, $id, 1);

$product['cart_id'] = $customerCartId;
session()->flash('success', 'Item Added To Cart Successfully');

$this->cartProduct->create($product);
return redirect()->back();

return redirect()->back();
} else {
session()->flash('error', 'Cannot Add Item in Cart');

return redirect()->back();
}
}
}

Expand All @@ -301,7 +348,6 @@ public function remove($id) {
*/

public function mergeCart() {

//considering cookie as a source of truth.
if(Cookie::has('cart_session_id')) {
/*
Expand Down
59 changes: 59 additions & 0 deletions packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php

namespace Webkul\Cart\Http\ViewComposers;

use Illuminate\View\View;
use Illuminate\Support\Collection;

use Webkul\Cart\Repositories\CartRepository;

use Cookie;
use Cart;
/**
* cart List Composer on Navigation Menu
*
* @author Prashant Singh <prashant.singh852@webkul.com>
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/

class CartComposer
{

/**
* The cart implementation
* for shop bundle's navigation
* menu
*/
protected $cart;

/**
* Bind data to the view.
*
* @param View $view
* @return void
*/
public function __construct(CartRepository $cart) {
$this->cart = $cart;
}

public function compose(View $view) {
if(auth()->guard('customer')->check()) {
$cart = $this->cart->findOneByField('customer_id', auth()->guard('customer')->user()->id);

$cart_products = $this->cart->getProducts($cart['id']);

// dd($cart_products);

$view->with('cart', $cart_products);

} else {
if(Cookie::has('cart_session_id')) {
$cart = $this->cart->findOneByField('session_id', Cookie::get('cart_session_id'));

$cart_products = $this->cart->getProducts($cart['id']);

$view->with('cart', $cart_products);
}
}
}
}
3 changes: 2 additions & 1 deletion packages/Webkul/Cart/src/Models/Cart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ class Cart extends Model
{
protected $table = 'cart';

protected $fillable = ['customer_id','session_id','channel_id','coupon_code','is_gift'];
protected $fillable = ['customer_id', 'session_id', 'channel_id', 'coupon_code', 'is_gift'];

protected $hidden = ['coupon_code'];

public function with_products() {

return $this->belongsToMany(Product::class, 'cart_products')->withPivot('id', 'product_id','quantity', 'cart_id');
}
}
Loading

0 comments on commit a24c789

Please sign in to comment.