hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 06:46:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #70 from openclassify/vedat

Browse Source 
#386
This commit is contained in:
Fatih Alp 2019-08-24 20:01:07 +03:00 committed by GitHub
commit e548ab5af3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -198,9 +198,15 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function addCart($item, $quantity = 1) public function addCart($item, $quantity = 1)
{ {
$cart = $this->dispatch(new GetCart()); if(Auth::user())
$cart->add($item, $quantity); {
return $this->dispatch(new GetCart()); $cart = $this->dispatch(new GetCart());
$cart->add($item, $quantity);
return $this->dispatch(new GetCart());
} else {
setcookie("cart[" . $item->id . "]", $quantity, time() + 3600, '/', NULL, 0);
}
} }

5
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -812,9 +812,8 @@ class AdvsController extends PublicController
} }
} }
public function advAddCart($id) public function advAddCart($id, $quantity = 1)
{ {
$quantity = 1;
$thisModel = new AdvModel(); $thisModel = new AdvModel();
$adv = $thisModel->isAdv($id); $adv = $thisModel->isAdv($id);
$response = array(); $response = array();
@ -825,7 +824,7 @@ class AdvsController extends PublicController
$response['status'] = "error"; $response['status'] = "error";
$response['msg'] = trans('visiosoft.module.advs::message.error_added_cart'); $response['msg'] = trans('visiosoft.module.advs::message.error_added_cart');
} }
return redirect('/cart/'); return back();
} }
public function addCart(Request $request) public function addCart(Request $request)

1
addons/default/visiosoft/default-theme/resources/css/default/main.css
View File

@ -2711,7 +2711,6 @@ a.verified i {
} }
.user-account input { .user-account input {
height: 44px;
margin-bottom: 30px; margin-bottom: 30px;
font-size: 16px; font-size: 16px;
} }

75
addons/default/visiosoft/default-theme/resources/views/partials/nav.twig
View File

@ -119,43 +119,48 @@
{% if entries('advs').isEnabled('carts') %} {% if entries('advs').isEnabled('carts') %}
{% set cart_items = entries('carts').getCart() %} {% if auth_check() %}
{% set cart = entries('carts').get()[0] %} {% set cart_items = entries('carts').getCart() %}
<li class="dropdown"> {% set cart = entries('carts').get()[0] %}
<a data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <li class="dropdown">
<i class="fa fa-shopping-cart"></i> {{ cart_items.quantity }}<span <a data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
class="caret"></span> <i class="fa fa-shopping-cart"></i> {{ cart_items.quantity }}<span
</a> class="caret"></span>
<ul class="dropdown-menu dropdown-cart" role="menu">
<!--items cart-->
{% for item_cart in cart_items.items(1) %}
<li>
<span class="cart-item">
<a href="{{ item_cart.detail_url }}">
<span class="cart-item-left">
<img src="{{ item_cart.cover_photo }}" alt="{{ item_cart.name }}"
height="50"
width="70"
class="item-cart-img">
<span class="item-name">{{ item_cart.name }}</span>
<span class="item-price">{{ item_cart.priceFormat(item_cart) }}</span>
<span class="item-quantity">{{ trans('visiosoft.module.advs::field.quantity') }}: {{ item_cart.quantity }}</span>
</span>
</a> </a>
<ul class="dropdown-menu dropdown-cart" role="menu">
<!--items cart-->
{% for item_cart in cart_items.items(1) %}
<li>
<span class="cart-item">
<a href="{{ item_cart.detail_url }}">
<span class="cart-item-left">
<img src="{{ item_cart.cover_photo }}" alt="{{ item_cart.name }}"
height="50"
width="70"
class="item-cart-img">
<span class="item-name">{{ item_cart.name }}</span>
<span class="item-price">{{ item_cart.priceFormat(item_cart) }}</span>
<span class="item-quantity">{{ trans('visiosoft.module.advs::field.quantity') }}: {{ item_cart.quantity }}</span>
</span>
</a>
</span> </span>
</li>
{% endfor %}
<li class="cart-footer">
<span class="lighter-text">{{ trans('visiosoft.module.advs::field.total') }}:</span>
<span class="total-color-text">{% if cart_items is null %}0{% else %}{{ cart.subtotal.currency }}{% endif %}</span>
</li> </li>
{% endfor %} <!--items cart-->
<li class="cart-footer"> <li><span><a class="text-center cart-view-button"
<span class="lighter-text">{{ trans('visiosoft.module.advs::field.total') }}:</span> href="/cart">{{ trans('visiosoft.module.advs::field.view_cart') }}</a></span>
<span class="total-color-text">{% if cart_items is null %}0{% else %}{{ cart.subtotal.currency }}{% endif %}</span> </li>
</li> </ul>
<!--items cart--> </li>
<li><span><a class="text-center cart-view-button" {% else %}
href="/cart">{{ trans('visiosoft.module.advs::field.view_cart') }}</a></span> {% include "visiosoft.module.carts::nav" %}
</li> {% endif %}
</ul>
</li>
{% endif %} {% endif %}
<li class="new-ads-navigation-field"><a href="/advs/create_adv" <li class="new-ads-navigation-field"><a href="/advs/create_adv"
@ -192,4 +197,4 @@
</ul> </ul>
</nav> </nav>
</div> </div>
</header> </header>

12
addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php
View File

@ -9,6 +9,9 @@ use Anomaly\UsersModule\User\Event\UserWasLoggedIn;
use Anomaly\UsersModule\User\User; use Anomaly\UsersModule\User\User;
use Anomaly\UsersModule\User\UserPassword; use Anomaly\UsersModule\User\UserPassword;
use Visiosoft\AdvsModule\Adv\AdvModel; 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 Visiosoft\CloudsiteModule\Site\Event\CreateSite;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Container\Container;
@ -99,6 +102,15 @@ class UserAuthenticator
if ($response = $this->authenticate($credentials)) { if ($response = $this->authenticate($credentials)) {
if ($response instanceof UserInterface) { if ($response instanceof UserInterface) {
$this->login($response, $remember); $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(); return Redirect::back();
} }
} }