Merge remote-tracking branch 'origin/master'

This commit is contained in:
vedatakd 2021-07-26 13:29:18 +03:00
commit b120d2d547

View File

@ -1,87 +1,72 @@
<?php namespace Visiosoft\AdvsModule\Http\Controller;
use Anomaly\Streams\Platform\Http\Controller\PublicController;
use Anomaly\Streams\Platform\Model\Configuration\ConfigurationConfigurationEntryModel;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Visiosoft\AdvsModule\Adv\AdvModel;
use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface;
use Visiosoft\AdvsModule\OptionConfiguration\Form\OptionConfigurationFormBuilder;
use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel;
use Visiosoft\CartsModule\Cart\CartModel;
use Visiosoft\CartsModule\Cart\CartRepository;
use Visiosoft\CartsModule\Cart\Command\GetCart;
class OptionConfigurationController extends PublicController
{
private $advRepository;
private $adv_model;
private $optionConfigurationModel;
private $optionConfigurationRepository;
private $adv_model;
private $optionConfigurationRepository;
private $cartRepository;
public function __construct(
AdvRepositoryInterface $advRepository,
AdvModel $advModel,
OptionConfigurationModel $optionConfigurationModel,
OptionConfigurationRepositoryInterface $optionConfigurationRepository
)
{
$this->advRepository = $advRepository;
$this->adv_model = $advModel;
$this->optionConfigurationModel = $optionConfigurationModel;
$this->optionConfigurationRepository = $optionConfigurationRepository;
parent::__construct();
}
public function __construct(
AdvModel $advModel,
OptionConfigurationRepositoryInterface $optionConfigurationRepository,
CartRepository $cartRepository
)
{
$this->adv_model = $advModel;
$this->optionConfigurationRepository = $optionConfigurationRepository;
$this->cartRepository = $cartRepository;
parent::__construct();
}
public function create(OptionConfigurationFormBuilder $form)
{
$form->setOption('redirect', route('advs_preview', [request('ad')]));
return $form->render();
}
public function create(OptionConfigurationFormBuilder $form)
{
$form->setOption('redirect', route('advs_preview', [request('ad')]));
return $form->render();
}
public function confAddCart()
{
if($conf = $this->optionConfigurationRepository->find($this->request->configuration))
{
if($conf->parent_adv->getStatus() == "approved")
{
public function confAddCart()
{
if ($conf = $this->optionConfigurationRepository->find($this->request->configuration)) {
if ($conf->parent_adv->getStatus() == "approved") {
$conf->name = $conf->getName();
if ($conf->stock < $this->request->quantity){
if ($conf->stock < $this->request->quantity) {
return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]);
}else{
} else {
$cart = $this->dispatch(new GetCart());
$cart->add($conf, $this->request->quantity);
return $this->redirect->to(route('visiosoft.module.carts::cart'));
}
}
$this->messages->info(trans('visiosoft.module.advs::message.error_added_cart'));
return back();
}
}
$this->messages->info(trans('visiosoft.module.advs::message.error_added_cart'));
return back();
}
}
public function ajaxConfAddCart()
{
if (\auth()->check()) {
if($conf = $this->optionConfigurationRepository->find($this->request->configuration))
{
$conf->name = $conf->getName();
public function ajaxConfAddCart()
{
if ($conf = $this->optionConfigurationRepository->find($this->request->configuration ?? $this->request->data['conf'])) {
$conf->name = $conf->getName();
$this->adv_model->authControl();
if ($conf->stock < $this->request->quantity) {
return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error1in2')]);
}
if ($conf->stock < $this->request->quantity){
return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error1in2')]);
}else{
$cart = $this->dispatch(new GetCart());
$cart->add($conf, $this->request->quantity);
$cart = $this->dispatch(new GetCart());
$cart->add($conf, ($this->request->quantity ?? $this->request->data['quantity']) ?? 1);
$count = $cart->getItems()->count;
return $this->response->json(['status'=> 'success', 'count' => $count]);
}
}
return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error2')]);
}
return $this->response->json(['status' => 'guest']);
}
$cart_item = $cart->getItems();
$count = $cart_item->count;
$cart = $this->cartRepository->find($cart_item[0]->cart_id);
return $this->response->json(['status' => 'success', 'count' => $count, 'cart' => $cart, 'cart_item' => $cart_item]);
}
return $this->response->json(['status' => 'error', 'msg' => trans('visiosoft.module.carts::message.error2')]);
}
}