diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 5496fef71..e89118958 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -198,9 +198,15 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function addCart($item, $quantity = 1) { - $cart = $this->dispatch(new GetCart()); - $cart->add($item, $quantity); - return $this->dispatch(new GetCart()); + if(Auth::user()) + { + $cart = $this->dispatch(new GetCart()); + $cart->add($item, $quantity); + return $this->dispatch(new GetCart()); + } else { + setcookie("cart[" . $item->id . "]", $quantity, time() + 3600, '/', NULL, 0); + } + } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 278c7ede4..67ec3ab4f 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -812,9 +812,8 @@ class AdvsController extends PublicController } } - public function advAddCart($id) + public function advAddCart($id, $quantity = 1) { - $quantity = 1; $thisModel = new AdvModel(); $adv = $thisModel->isAdv($id); $response = array(); @@ -825,7 +824,7 @@ class AdvsController extends PublicController $response['status'] = "error"; $response['msg'] = trans('visiosoft.module.advs::message.error_added_cart'); } - return redirect('/cart/'); + return back(); } public function addCart(Request $request) diff --git a/addons/default/visiosoft/default-theme/resources/css/default/main.css b/addons/default/visiosoft/default-theme/resources/css/default/main.css index b5f2552d8..3c35b6028 100755 --- a/addons/default/visiosoft/default-theme/resources/css/default/main.css +++ b/addons/default/visiosoft/default-theme/resources/css/default/main.css @@ -2711,7 +2711,6 @@ a.verified i { } .user-account input { - height: 44px; margin-bottom: 30px; font-size: 16px; } diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig b/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig index 63040729a..707aa1ed0 100644 --- a/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig +++ b/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig @@ -119,43 +119,48 @@ {% if entries('advs').isEnabled('carts') %} - {% set cart_items = entries('carts').getCart() %} - {% set cart = entries('carts').get()[0] %} - + {% else %} + {% include "visiosoft.module.carts::nav" %} + {% endif %} + {% endif %}
  • - \ No newline at end of file + diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php index 0bbe00336..98729c2af 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php @@ -9,6 +9,9 @@ use Anomaly\UsersModule\User\Event\UserWasLoggedIn; use Anomaly\UsersModule\User\User; use Anomaly\UsersModule\User\UserPassword; use Visiosoft\AdvsModule\Adv\AdvModel; +use Visiosoft\AdvsModule\Http\Controller\AdvsController; +use Visiosoft\CartsModule\Saleitem\Command\ProcessSaleitem; +use Visiosoft\CartsModule\Saleitem\SaleitemModel; use Visiosoft\CloudsiteModule\Site\Event\CreateSite; use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Container\Container; @@ -99,6 +102,15 @@ class UserAuthenticator if ($response = $this->authenticate($credentials)) { if ($response instanceof UserInterface) { $this->login($response, $remember); + if(isset($_COOKIE['cart'])) + { + foreach ($_COOKIE['cart'] as $adv => $quantity) + { + $advs = new AdvsController(); + $advs->advAddCart($adv,$quantity); + setcookie("cart[" . $adv . "]", null, -1, '/'); + } + } return Redirect::back(); } }