From 393f50f04e283b8e163c1809ac8bb60d082a0dab Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 15 Jan 2020 13:02:51 +0300 Subject: [PATCH] remove old cookie function && update currency method --- .../resources/views/ad-detail/partials/detail.twig | 2 +- .../visiosoft/advs-module/src/Adv/AdvModel.php | 11 +++-------- .../src/Http/Controller/advsController.php | 2 +- .../src/Http/Controller/UserAuthenticator.php | 7 ------- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig index 90d6410ab..ce50acfb9 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig @@ -2,7 +2,7 @@ {% if blocks('ad-item-details-block-area') is null %}

- {{ adv.price.format() }} {{ adv.currency }} + {{ currency_symbol(adv.currency) }}{{ adv.price.format() }} {{ addBlock('ad-detail/priceField',{'adv':adv})|raw }} diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 4772d8d80..71e252d20 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -219,14 +219,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function addCart($item, $quantity = 1) { - 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); - } - + $cart = $this->dispatch(new GetCart()); + $cart->add($item, $quantity); + return $this->dispatch(new GetCart()); } 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 022b5840b..f13111e84 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -1014,7 +1014,7 @@ class AdvsController extends PublicController $point = "."; $response['newPrice'] = number_format($response['newPrice'], $decimals, $point, str_replace(' ', ' ', $separator)); - $symbol = config('streams::currencies.supported.' . strtoupper(setting_value('streams::currency')) . '.symbol'); + $symbol = config('streams::currencies.supported.' . strtoupper($adv->currency) . '.symbol'); $response['newPrice'] = $symbol . $response['newPrice']; $response['status'] = $status; 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 dff38646e..7a3dd10f0 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php @@ -103,13 +103,6 @@ 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(); } }