Browse Source

Merge branch 'develop'

master^2
Fab 3 years ago
parent
commit
fa1278580e
67 changed files with 1319 additions and 228 deletions
  1. +8
    -0
      ShopBundle/Context/SectionInterface.php
  2. +8
    -0
      ShopBundle/Context/SectionUtilsInterface.php
  3. +8
    -1
      ShopBundle/Controller/AddressApiController.php
  4. +104
    -35
      ShopBundle/Controller/Backend/AdminController.php
  5. +4
    -3
      ShopBundle/Controller/Backend/DocumentController.php
  6. +5
    -6
      ShopBundle/Controller/Backend/NewsController.php
  7. +20
    -2
      ShopBundle/Controller/Backend/OrderController.php
  8. +3
    -4
      ShopBundle/Controller/Backend/ProductFamilyController.php
  9. +104
    -11
      ShopBundle/Controller/Backend/TicketController.php
  10. +4
    -2
      ShopBundle/Controller/Backend/UserMerchantController.php
  11. +4
    -0
      ShopBundle/Controller/Frontend/CartController.php
  12. +14
    -9
      ShopBundle/Form/Backend/ProductFamily/ProductFamilyCategoriesType.php
  13. +17
    -17
      ShopBundle/Form/Backend/ProductFamily/ProductType.php
  14. +78
    -0
      ShopBundle/Form/Backend/Ticket/TicketTypeType.php
  15. +2
    -0
      ShopBundle/Form/Frontend/RegistrationType.php
  16. +18
    -1
      ShopBundle/Model/OrderShop.php
  17. +31
    -6
      ShopBundle/Model/ProductCategory.php
  18. +31
    -1
      ShopBundle/Model/ProductFamily.php
  19. +172
    -0
      ShopBundle/Model/Section.php
  20. +1
    -0
      ShopBundle/Model/Ticket.php
  21. +4
    -0
      ShopBundle/Repository/OrderShopRepository.php
  22. +13
    -1
      ShopBundle/Repository/ProductCategoryRepository.php
  23. +18
    -1
      ShopBundle/Repository/ProductFamilyRepository.php
  24. +50
    -0
      ShopBundle/Repository/SectionRepository.php
  25. +81
    -64
      ShopBundle/Resources/public/css/backend/custom.css
  26. +84
    -0
      ShopBundle/Resources/public/js/backend/script/default/init-common.js
  27. +4
    -0
      ShopBundle/Resources/public/js/backend/script/merchant/vuejs-merchant.js
  28. +9
    -0
      ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js
  29. +3
    -2
      ShopBundle/Resources/public/js/backend/script/user/init-edit.js
  30. +6
    -0
      ShopBundle/Resources/public/sass/backend/custom.scss
  31. +19
    -1
      ShopBundle/Resources/translations/lcshop.fr.yaml
  32. +2
    -2
      ShopBundle/Resources/views/backend/default/block/list_tickets.html.twig
  33. +103
    -0
      ShopBundle/Resources/views/backend/default/block/paginator.html.twig
  34. +0
    -0
      ShopBundle/Resources/views/backend/default/field/association.html.twig
  35. +0
    -0
      ShopBundle/Resources/views/backend/default/field/association_users.html.twig
  36. +0
    -0
      ShopBundle/Resources/views/backend/default/field/badge.html.twig
  37. +0
    -0
      ShopBundle/Resources/views/backend/default/field/children.html.twig
  38. +0
    -0
      ShopBundle/Resources/views/backend/default/field/date.html.twig
  39. +0
    -0
      ShopBundle/Resources/views/backend/default/field/datetime.html.twig
  40. +0
    -0
      ShopBundle/Resources/views/backend/default/field/day.html.twig
  41. +0
    -0
      ShopBundle/Resources/views/backend/default/field/options_translatable.html.twig
  42. +0
    -0
      ShopBundle/Resources/views/backend/default/field/price.html.twig
  43. +0
    -0
      ShopBundle/Resources/views/backend/default/field/product_family_available_quantity.html.twig
  44. +0
    -0
      ShopBundle/Resources/views/backend/default/field/product_family_total_product_ordered.html.twig
  45. +3
    -0
      ShopBundle/Resources/views/backend/default/field/supplier.html.twig
  46. +0
    -0
      ShopBundle/Resources/views/backend/default/field/ticket_last_message.html.twig
  47. +0
    -0
      ShopBundle/Resources/views/backend/default/field/ticket_status.html.twig
  48. +0
    -0
      ShopBundle/Resources/views/backend/default/field/toggle.html.twig
  49. +0
    -0
      ShopBundle/Resources/views/backend/default/field/total.html.twig
  50. +20
    -5
      ShopBundle/Resources/views/backend/default/list.html.twig
  51. +3
    -1
      ShopBundle/Resources/views/backend/merchant/form.html.twig
  52. +18
    -0
      ShopBundle/Resources/views/backend/merchant/panel_lunch.html.twig
  53. +11
    -0
      ShopBundle/Resources/views/backend/order/show-cart.html.twig
  54. +12
    -0
      ShopBundle/Resources/views/backend/order/show-order.html.twig
  55. +0
    -0
      ShopBundle/Resources/views/backend/order/show.html.twigTODELETE
  56. +1
    -1
      ShopBundle/Resources/views/backend/productfamily/form.html.twig
  57. +23
    -4
      ShopBundle/Resources/views/backend/productfamily/panel_general.html.twig
  58. +6
    -6
      ShopBundle/Resources/views/backend/ticket/list-fields/field_lastmessage_date.html.twig
  59. +38
    -0
      ShopBundle/Resources/views/backend/ticket/modal/create.html.twig
  60. +30
    -17
      ShopBundle/Resources/views/backend/user/edit.html.twig
  61. +14
    -4
      ShopBundle/Resources/views/backend/usermerchant/show.html.twig
  62. +16
    -6
      ShopBundle/Services/Order/OrderUtils.php
  63. +3
    -2
      ShopBundle/Services/Order/OrderUtilsCartTrait.php
  64. +19
    -2
      ShopBundle/Services/Order/OrderUtilsStockTrait.php
  65. +37
    -0
      ShopBundle/Services/SectionUtils.php
  66. +23
    -10
      ShopBundle/Services/TicketUtils.php
  67. +10
    -1
      ShopBundle/Services/UtilsManager.php

+ 8
- 0
ShopBundle/Context/SectionInterface.php View File

<?php

namespace Lc\ShopBundle\Context;

interface SectionInterface
{

}

+ 8
- 0
ShopBundle/Context/SectionUtilsInterface.php View File

<?php

namespace Lc\ShopBundle\Context;

interface SectionUtilsInterface
{

}

+ 8
- 1
ShopBundle/Controller/AddressApiController.php View File



$codesPostaux = $city->codesPostaux ; $codesPostaux = $city->codesPostaux ;


if($context == 'frontend') {
$label = '<span class="city">'.$city->nom.'</span> <span class="zip">'.$codesPostaux[0].'</span>' ;
}
else {
$label = $city->nom.' - '.$codesPostaux[0] ;
}

$return[] = [ $return[] = [
'label' => '<span class="city">'.$city->nom.'</span> <span class="zip">'.$codesPostaux[0].'</span>',
'label' => $label,
'city' => $city->nom, 'city' => $city->nom,
'value' => $city->code 'value' => $city->code
] ; ] ;

+ 104
- 35
ShopBundle/Controller/Backend/AdminController.php View File

use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvents;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;


protected $merchantUtils; protected $merchantUtils;
protected $mailjetTransport; protected $mailjetTransport;
protected $orderUtils; protected $orderUtils;
protected $mailUtils ;
protected $mailUtils;
protected $translator; protected $translator;
protected $utilsProcess; protected $utilsProcess;
protected $session;
protected $sectionUtils;
protected $filtersForm = null; protected $filtersForm = null;


public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em,
MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator)
MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator, SessionInterface $session)
{ {
$this->security = $security; $this->security = $security;
$this->userManager = $userManager; $this->userManager = $userManager;
$this->utils = $utilsManager->getUtils(); $this->utils = $utilsManager->getUtils();
$this->merchantUtils = $utilsManager->getMerchantUtils(); $this->merchantUtils = $utilsManager->getMerchantUtils();
$this->orderUtils = $utilsManager->getOrderUtils();; $this->orderUtils = $utilsManager->getOrderUtils();;
$this->mailUtils = $utilsManager->getMailUtils() ;
$this->utilsProcess = $utilsManager->getUtilsProcess() ;
$this->mailUtils = $utilsManager->getMailUtils();
$this->utilsProcess = $utilsManager->getUtilsProcess();
$this->sectionUtils = $utilsManager->getSectionUtils();
$this->translator = $translator; $this->translator = $translator;
$this->session = $session;
} }


public function createCustomForm($class, $action, $parameters, $data = true, $options = array()) public function createCustomForm($class, $action, $parameters, $data = true, $options = array())
$dqlFilter = sprintf(str_replace('currentMerchant', $this->getUser()->getMerchant()->getId(), $dqlFilter)); $dqlFilter = sprintf(str_replace('currentMerchant', $this->getUser()->getMerchant()->getId(), $dqlFilter));
} }


if ($pos = strpos($dqlFilter, 'TODAYSTART')) {
$date = new \DateTime();
$dqlFilter = sprintf(str_replace('TODAYSTART', $date->format('Y-m-d').' 00:00:00', $dqlFilter));
}
if ($pos = strpos($dqlFilter, 'TODAYEND')) {
$date = new \DateTime();
$dqlFilter = sprintf(str_replace('TODAYEND', $date->format('Y-m-d').' 23:59:59', $dqlFilter));
}

if ($pos = strpos($dqlFilter, 'sectionLunch')) {
$dqlFilter = sprintf(str_replace('sectionLunch', $this->sectionUtils->getSection('lunch')->getId(), $dqlFilter));
} else if ($pos = strpos($dqlFilter, 'sectionMarket')) {
$dqlFilter = sprintf(str_replace('sectionMarket', $this->sectionUtils->getSection('market')->getId(), $dqlFilter));
}

if (new $entityClass instanceof StatusInterface && strpos($dqlFilter, 'entity.status') === false) { if (new $entityClass instanceof StatusInterface && strpos($dqlFilter, 'entity.status') === false) {
if ($dqlFilter) $dqlFilter .= sprintf(' AND entity.status > = 0'); if ($dqlFilter) $dqlFilter .= sprintf(' AND entity.status > = 0');
else $dqlFilter .= sprintf(' entity.status > = 0'); else $dqlFilter .= sprintf(' entity.status > = 0');


if ($this->filtersForm->isSubmitted() && $this->filtersForm->isValid()) { if ($this->filtersForm->isSubmitted() && $this->filtersForm->isValid()) {
foreach ($listFields as $field) { foreach ($listFields as $field) {
if ($this->filtersForm->has($field['property'])) {
if ($this->filtersForm->has($field['property'])) {
switch ($field['dataType']) { switch ($field['dataType']) {
case 'option': case 'option':
case 'integer': case 'integer':
} else { } else {
$queryBuilder->andWhere('entity.' . $field['property'] . ' = :' . $field['property'] . ''); $queryBuilder->andWhere('entity.' . $field['property'] . ' = :' . $field['property'] . '');
} }
if($filter instanceof TreeInterface && $filter->getParent() == null) {
if ($filter instanceof TreeInterface && $filter->getParent() == null) {
$queryBuilder->setParameter($field['property'], array_merge(array($filter), $filter->getChildrens()->toArray())); $queryBuilder->setParameter($field['property'], array_merge(array($filter), $filter->getChildrens()->toArray()));
}else{
} else {
$queryBuilder->setParameter($field['property'], $filter); $queryBuilder->setParameter($field['property'], $filter);
} }
} }
} }
} }


//TODO déplacer dans LC
if($this->entity['name']== 'OrderShopLunch' || $this->entity['name']== 'OrderShopLunchDay'){
$queryBuilder->addOrderBy('entity.user', 'asc');
}

return $queryBuilder; return $queryBuilder;
} }


return $this->executeDynamicMethod('render<EntityName>Template', ['list', $this->entity['templates']['list'], $parameters]); return $this->executeDynamicMethod('render<EntityName>Template', ['list', $this->entity['templates']['list'], $parameters]);
} }


protected function getListParam($param, $default =null){
$entityName = $this->entity['name'];
$sessionParam = $entityName.$param;
//CUSTOM
if($param == 'maxResults'){
$val = $this->entity['list']['max_results'];
}else{
$val = $this->request->query->get($param, $default);
}

if(isset($_GET[$param])){
$val = $this->request->query->get($param);
$this->session->set($sessionParam, $val);
}else if($this->session->get($sessionParam)){
$val = $this->session->get($sessionParam);
$this->request->query->set($param, $val);
}

return $val;
}

protected function listAction()
{
$this->dispatch(EasyAdminEvents::PRE_LIST);

$fields = $this->entity['list']['fields'];

$paginator = $this->findAll($this->entity['class'], $this->getListParam('page', 1), $this->getListParam('maxResults'), $this->getListParam('sortField'), $this->getListParam('sortDirection'), $this->entity['list']['dql_filter']);

$this->dispatch(EasyAdminEvents::POST_LIST, ['paginator' => $paginator]);

$parameters = [
'paginator' => $paginator,
'fields' => $fields,
'batch_form' => $this->createBatchForm($this->entity['name'])->createView(),
'delete_form_template' => $this->createDeleteForm($this->entity['name'], '__id__')->createView(),
];

return $this->executeDynamicMethod('render<EntityName>Template', ['list', $this->entity['templates']['list'], $parameters]);
}


public function sortAction() public function sortAction()
{ {
$form->add($child->getName(), EntityType::class, array( $form->add($child->getName(), EntityType::class, array(
'class' => $this->em->getClassMetadata($passedOptions['class'])->getName(), 'class' => $this->em->getClassMetadata($passedOptions['class'])->getName(),
'label' => $passedOptions['label'], 'label' => $passedOptions['label'],
'expanded' => isset($passedOptions['expanded']) ? $passedOptions['expanded'] : false,
'multiple' => isset($passedOptions['multiple']) ? $passedOptions['multiple'] : false, 'multiple' => isset($passedOptions['multiple']) ? $passedOptions['multiple'] : false,
'placeholder' => '--', 'placeholder' => '--',
'translation_domain' => 'lcshop', 'translation_domain' => 'lcshop',


$id = $this->request->query->get('id'); $id = $this->request->query->get('id');
$easyadmin = $this->request->attributes->get('easyadmin'); $easyadmin = $this->request->attributes->get('easyadmin');
$entity = $easyadmin['item'];
$entity = $easyadmin['item'];


if ($this->request->isXmlHttpRequest() && $property = $this->request->query->get('property')) { if ($this->request->isXmlHttpRequest() && $property = $this->request->query->get('property')) {
$newValue = 'true' === mb_strtolower($this->request->query->get('newValue')); $newValue = 'true' === mb_strtolower($this->request->query->get('newValue'));
return $this->executeDynamicMethod('render<EntityName>Template', ['edit', $this->entity['templates']['edit'], $parameters]); return $this->executeDynamicMethod('render<EntityName>Template', ['edit', $this->entity['templates']['edit'], $parameters]);
} }


/* public function createNewEntity(){
$idDuplicate = $this->request->query->get('duplicate', null);
if($idDuplicate){
$easyadmin = $this->request->attributes->get('easyadmin');
$entity= $this->em->getRepository($easyadmin['entity']['class'])->find($idDuplicate);
/* public function createNewEntity(){
$idDuplicate = $this->request->query->get('duplicate', null);
if($idDuplicate){
$easyadmin = $this->request->attributes->get('easyadmin');
$entity= $this->em->getRepository($easyadmin['entity']['class'])->find($idDuplicate);


$newProductFamily = clone $entity ;
$this->em->persist($newProductFamily) ;
$this->em->flush() ;
}else{
$entityFullyQualifiedClassName = $this->entity['class'];
$newProductFamily = clone $entity ;
$this->em->persist($newProductFamily) ;
$this->em->flush() ;
}else{
$entityFullyQualifiedClassName = $this->entity['class'];


return new $entityFullyQualifiedClassName();
}
return new $entityFullyQualifiedClassName();
}


}*/
}*/


public function duplicateAction(){
public function duplicateAction()
{


$id = $this->request->query->get('id'); $id = $this->request->query->get('id');
$refererUrl = $this->request->query->get('referer', ''); $refererUrl = $this->request->query->get('referer', '');


$easyadmin = $this->request->attributes->get('easyadmin'); $easyadmin = $this->request->attributes->get('easyadmin');


$entity= $this->em->getRepository($easyadmin['entity']['class'])->find($id);
$entity = $this->em->getRepository($easyadmin['entity']['class'])->find($id);


$newEntity = $this->utilsProcess->duplicateEntity($entity); $newEntity = $this->utilsProcess->duplicateEntity($entity);


return $this->redirectToRoute('easyadmin', ['entity' => $easyadmin['entity']['name'], 'action' => 'edit', 'id' =>$newEntity->getId(), 'referer' =>$refererUrl ]) ;
return $this->redirectToRoute('easyadmin', ['entity' => $easyadmin['entity']['name'], 'action' => 'edit', 'id' => $newEntity->getId(), 'referer' => $refererUrl]);
} }


public function duplicateOtherHubAction(){
public function duplicateOtherHubAction()
{


$id = $this->request->query->get('id'); $id = $this->request->query->get('id');
$hubAlias = $this->request->query->get('hub'); $hubAlias = $this->request->query->get('hub');
$refererUrl = $this->request->query->get('referer', ''); $refererUrl = $this->request->query->get('referer', '');
$user = $this->security->getUser() ;
$user = $this->security->getUser();


$easyadmin = $this->request->attributes->get('easyadmin'); $easyadmin = $this->request->attributes->get('easyadmin');


$entity= $this->em->getRepository($easyadmin['entity']['class'])->find($id);
$hub= $this->em->getRepository(MerchantInterface::class)->findOneByDevAlias($hubAlias);
$entity = $this->em->getRepository($easyadmin['entity']['class'])->find($id);
$hub = $this->em->getRepository(MerchantInterface::class)->findOneByDevAlias($hubAlias);


$newEntity = $this->utilsProcess->duplicateEntityToOtherHub($entity,$hub);
$newEntity = $this->utilsProcess->duplicateEntityToOtherHub($entity, $hub);


$user->setMerchant($hub); $user->setMerchant($hub);
$this->em->persist($user); $this->em->persist($user);
$this->em->flush(); $this->em->flush();


$redirectUrl = $this->generateUrl('easyadmin', ['entity' => $easyadmin['entity']['name'], 'action' => 'edit', 'id' =>$newEntity->getId(), 'referer' =>$refererUrl ]).'&hubredirection=true';
$redirectUrl = $this->generateUrl('easyadmin', ['entity' => $easyadmin['entity']['name'], 'action' => 'edit', 'id' => $newEntity->getId(), 'referer' => $refererUrl]) . '&hubredirection=true';


return $this->redirectToOtherHub($hub, $redirectUrl) ;
return $this->redirectToOtherHub($hub, $redirectUrl);
} }


public function redirectToOtherHub($hub, $url){
if(strpos($_SERVER['HTTP_HOST'], 'localhost')!==false){
public function redirectToOtherHub($hub, $url)
{
if (strpos($_SERVER['HTTP_HOST'], 'localhost') !== false) {
return $this->redirect($url); return $this->redirect($url);
}else{
return $this->redirect($hub->getMerchantConfig('url').substr($url,1));
} else {
return $this->redirect($hub->getMerchantConfig('url') . substr($url, 1));
} }


} }

+ 4
- 3
ShopBundle/Controller/Backend/DocumentController.php View File

use Lc\ShopBundle\Services\UtilsManager; use Lc\ShopBundle\Services\UtilsManager;
use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport; use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport;
use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
{ {
protected $documentRepository ; protected $documentRepository ;


public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator)
public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator, SessionInterface $session)
{ {
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator);
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator, $session);
$this->documentRepository = $this->em->getRepository($this->em->getClassMetadata(DocumentInterface::class)->getName()) ; $this->documentRepository = $this->em->getRepository($this->em->getClassMetadata(DocumentInterface::class)->getName()) ;
} }


} }
} }


}
}

+ 5
- 6
ShopBundle/Controller/Backend/NewsController.php View File

use Lc\ShopBundle\Services\UtilsManager; use Lc\ShopBundle\Services\UtilsManager;
use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport; use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
{ {
protected $parameterBag ; protected $parameterBag ;


public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em,
MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator,
ParameterBagInterface $parameterBag)
public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator, SessionInterface $session, ParameterBagInterface $parameterBag)
{ {
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator, $session);
$this->parameterBag = $parameterBag ; $this->parameterBag = $parameterBag ;
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator);
} }


public function sendTestAction() public function sendTestAction()
$newsletter = $this->getNewsletter() ; $newsletter = $this->getNewsletter() ;
$news = $this->getNews() ; $news = $this->getNews() ;
$users = $this->em->getRepository($this->em->getClassMetadata(UserInterface::class)->getName())->findAllByNewsletter($newsletter) ; $users = $this->em->getRepository($this->em->getClassMetadata(UserInterface::class)->getName())->findAllByNewsletter($newsletter) ;
$countUsers = count($users) ; $countUsers = count($users) ;


$packageMessagesArray = []; $packageMessagesArray = [];
} }
} }


}
}

+ 20
- 2
ShopBundle/Controller/Backend/OrderController.php View File

use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
protected $creditUtils; protected $creditUtils;
protected $mailUtils; protected $mailUtils;


public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator)
public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator, SessionInterface $session)
{ {
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator, $session);
$this->creditUtils = $utilsManager->getCreditUtils(); $this->creditUtils = $utilsManager->getCreditUtils();
$this->mailUtils = $utilsManager->getMailUtils(); $this->mailUtils = $utilsManager->getMailUtils();
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator);
} }


protected function createListQueryBuilder($entityClass, $sortDirection, $sortField = null, $dqlFilter = null) protected function createListQueryBuilder($entityClass, $sortDirection, $sortField = null, $dqlFilter = null)
$id = $this->request->query->get('id'); $id = $this->request->query->get('id');
$entity = $this->request->query->get('entity'); $entity = $this->request->query->get('entity');


if ($this->request->isXmlHttpRequest() && $property = $this->request->query->get('property')) {
$newValue = 'true' === mb_strtolower($this->request->query->get('newValue'));
$fieldsMetadata = $this->entity['list']['fields'];
if($property == 'isGivenToCustomer'){
$orderShop =$this->getOrderShopEntity();
$orderShop->setIsGivenToCustomer($newValue);
$this->em->persist($orderShop);
$this->em->flush();
$this->utils->addFlash('success', 'success.common.fieldChange');
$response['flashMessages'] = $this->utils->getFlashMessages();
return new Response(json_encode($response));
}


}


return $this->redirectToRoute('easyadmin', [ return $this->redirectToRoute('easyadmin', [
'action' => 'show', 'action' => 'show',
'entity' => $entity, 'entity' => $entity,

+ 3
- 4
ShopBundle/Controller/Backend/ProductFamilyController.php View File

use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormError;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
private $parameterBag ; private $parameterBag ;
private $productFamilyUtils ; private $productFamilyUtils ;


public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em,
MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator,
ParameterBagInterface $parameterBag)
public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator, SessionInterface $session, ParameterBagInterface $parameterBag)
{ {
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator);
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator, $session);
$this->parameterBag = $parameterBag ; $this->parameterBag = $parameterBag ;
$this->productFamilyUtils = $utilsManager->getProductFamilyUtils() ; $this->productFamilyUtils = $utilsManager->getProductFamilyUtils() ;
} }

+ 104
- 11
ShopBundle/Controller/Backend/TicketController.php View File

use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use EasyCorp\Bundle\EasyAdminBundle\Event\EasyAdminEvents; use EasyCorp\Bundle\EasyAdminBundle\Event\EasyAdminEvents;
use FOS\UserBundle\Model\UserManagerInterface; use FOS\UserBundle\Model\UserManagerInterface;
use Lc\ShopBundle\Context\OrderShopInterface;
use Lc\ShopBundle\Context\UserInterface;
use Lc\ShopBundle\Form\Backend\Ticket\TicketMessageType; use Lc\ShopBundle\Form\Backend\Ticket\TicketMessageType;
use Lc\ShopBundle\Form\Backend\Ticket\TicketStatusType; use Lc\ShopBundle\Form\Backend\Ticket\TicketStatusType;
use Lc\ShopBundle\Model\Ticket; use Lc\ShopBundle\Model\Ticket;
use Lc\ShopBundle\Services\UtilsManager; use Lc\ShopBundle\Services\UtilsManager;
use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport; use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;


class TicketController extends AdminController class TicketController extends AdminController
{ {
protected $ticketUtils; protected $ticketUtils;
public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator)
protected $userUtils;

public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator, SessionInterface $session)
{ {
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator, $session);
$this->ticketUtils = $utilsManager->getTicketUtils(); $this->ticketUtils = $utilsManager->getTicketUtils();
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator);

$this->userUtils = $utilsManager->getUserUtils();
} }


public function persistTicketEntity($entity, $form)
{
$entity->setStatus(Ticket::TICKET_STATUS_OPEN);

$ticket = $this->ticketUtils->createTicket([
'user' => $entity->getUser(),
'type' => $entity->getType(),
'orderShop' => $entity->getOrderShop(),
'subject' => $entity->getSubject(),
'message' => $form->get('message')->getData(),
'createByAdmin' => true,
]);

}


protected function createListQueryBuilder($entityClass, $sortDirection, $sortField = null, $dqlFilter = null) protected function createListQueryBuilder($entityClass, $sortDirection, $sortField = null, $dqlFilter = null)
{ {
} }




public function ticketStatusAction(){
public function ticketStatusAction()
{
$easyadmin = $this->request->attributes->get('easyadmin'); $easyadmin = $this->request->attributes->get('easyadmin');
$ticket = $easyadmin['item']; $ticket = $easyadmin['item'];


$formTicketStatusForm->handleRequest($this->request); $formTicketStatusForm->handleRequest($this->request);


if ($formTicketStatusForm->isSubmitted() && $formTicketStatusForm->isValid()) { if ($formTicketStatusForm->isSubmitted() && $formTicketStatusForm->isValid()) {
$this->em->persist($ticket);
$this->em->flush();
$this->em->persist($ticket);
$this->em->flush();


$this->utils->addFlash('success', 'success.ticket.statusChange');
$this->utils->addFlash('success', 'success.ticket.statusChange');
} else { } else {
$this->utils->addFlash('error', $formTicketStatusForm->getErrors()); $this->utils->addFlash('error', $formTicketStatusForm->getErrors());
} }
return new Response(json_encode($response)); return new Response(json_encode($response));
} }


public function newMessageTicketAction(){
public function newMessageTicketAction()
{
$easyadmin = $this->request->attributes->get('easyadmin'); $easyadmin = $this->request->attributes->get('easyadmin');
$ticket = $easyadmin['item']; $ticket = $easyadmin['item'];




if ($formAddTicketMessage->isSubmitted() && $formAddTicketMessage->isValid()) { if ($formAddTicketMessage->isSubmitted() && $formAddTicketMessage->isValid()) {
$this->ticketUtils->createTicketMessage(array( $this->ticketUtils->createTicketMessage(array(
'ticket'=>$ticket,
'message'=> $formAddTicketMessage->get('message')->getData(),
'answerByAdmin'=>true
'ticket' => $ticket,
'message' => $formAddTicketMessage->get('message')->getData(),
'answerByAdmin' => true
)); ));


$this->utils->addFlash('success', 'success.ticket.addMessage'); $this->utils->addFlash('success', 'success.ticket.addMessage');
'id' => $ticket->getId() 'id' => $ticket->getId()
]); ]);
} }

public function newAction()
{
$this->dispatch(EasyAdminEvents::PRE_NEW);

$entity = $this->executeDynamicMethod('createNew<EntityName>Entity');

$easyadmin = $this->request->attributes->get('easyadmin');
$easyadmin['item'] = $entity;
$this->request->attributes->set('easyadmin', $easyadmin);

$fields = $this->entity['new']['fields'];

$newForm = $this->executeDynamicMethod('create<EntityName>NewForm', [$entity, $fields]);

if ($this->request->request->get('user')) {
$userRepo = $this->em->getRepository(UserInterface::class);
$newForm->get('user')->setData($userRepo->find($this->request->request->get('user')));
}

if ($this->request->request->get('orderId')) {
$newForm->get('orderId')->setData($this->request->request->get('orderId'));
}


$newForm->handleRequest($this->request);

if ($newForm->isSubmitted() && $newForm->isValid()) {

if ($newForm->get('orderId')->getData()) {
$orderShopRepo = $this->em->getRepository(OrderShopInterface::class);
$orderShop = $orderShopRepo->find($newForm->get('orderId')->getData());
if($orderShop)$entity->setOrderShop($orderShop);
}


$this->processUploadedFiles($newForm);

$this->dispatch(EasyAdminEvents::PRE_PERSIST, ['entity' => $entity]);
$this->executeDynamicMethod('persist<EntityName>Entity', [$entity, $newForm]);
$this->dispatch(EasyAdminEvents::POST_PERSIST, ['entity' => $entity]);

$this->utils->addFlash('success', 'success.ticket.addMessage');

if ($this->request->isXmlHttpRequest()) {
$response['type'] = 'success';
$response['flashMessages'] = $this->utils->getFlashMessages();
return new Response(json_encode($response));
} else {
return $this->redirectToReferrer();
}


}
$this->dispatch(EasyAdminEvents::POST_NEW, [
'entity_fields' => $fields,
'form' => $newForm,
'entity' => $entity,
]);

$parameters = [
'form' => $newForm->createView(),
'entity_fields' => $fields,
'entity' => $entity,
];
if ($this->request->isXmlHttpRequest()) {
$response['modal'] = $this->renderView('@LcShop/backend/ticket/modal/create.html.twig', $parameters);
return new Response(json_encode($response));
} else {
return $this->executeDynamicMethod('render<EntityName>Template', ['new', $this->entity['templates']['new'], $parameters]);
}
}
} }

+ 4
- 2
ShopBundle/Controller/Backend/UserMerchantController.php View File

use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport; use Mailjet\MailjetSwiftMailer\SwiftMailer\MailjetTransport;
use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;


{ {
protected $creditUtils; protected $creditUtils;


public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator)
public function __construct(Security $security, UserManagerInterface $userManager, EntityManagerInterface $em, MailjetTransport $mailjetTransport, UtilsManager $utilsManager, TranslatorInterface $translator, SessionInterface $session)
{ {
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator);
parent::__construct($security, $userManager, $em, $mailjetTransport, $utilsManager, $translator, $session);
$this->creditUtils = $utilsManager->getCreditUtils(); $this->creditUtils = $utilsManager->getCreditUtils();

} }


public function addCreditHistoryAction(){ public function addCreditHistoryAction(){

+ 4
- 0
ShopBundle/Controller/Frontend/CartController.php View File

protected $orderUtils ; protected $orderUtils ;
protected $userUtils ; protected $userUtils ;
protected $priceUtils ; protected $priceUtils ;
protected $sectionUtils ;
protected $mailUtils ;
protected $router ; protected $router ;
protected $productFamilyRepository ; protected $productFamilyRepository ;
protected $orderProductRepository ; protected $orderProductRepository ;
$this->orderUtils = $utilsManager->getOrderUtils() ; $this->orderUtils = $utilsManager->getOrderUtils() ;
$this->userUtils = $utilsManager->getUserUtils() ; $this->userUtils = $utilsManager->getUserUtils() ;
$this->priceUtils = $utilsManager->getPriceUtils() ; $this->priceUtils = $utilsManager->getPriceUtils() ;
$this->sectionUtils = $utilsManager->getSectionUtils() ;
$this->mailUtils = $utilsManager->getMailUtils() ;
$this->router = $router ; $this->router = $router ;
$this->productFamilyRepository = $this->em->getRepository($this->em->getClassMetaData(ProductFamilyInterface::class)->getName()) ; $this->productFamilyRepository = $this->em->getRepository($this->em->getClassMetaData(ProductFamilyInterface::class)->getName()) ;
$this->orderProductRepository = $this->em->getRepository($this->em->getClassMetaData(OrderProductInterface::class)->getName()) ; $this->orderProductRepository = $this->em->getRepository($this->em->getClassMetaData(OrderProductInterface::class)->getName()) ;

+ 14
- 9
ShopBundle/Form/Backend/ProductFamily/ProductFamilyCategoriesType.php View File

class ProductFamilyCategoriesType extends AbstractType class ProductFamilyCategoriesType extends AbstractType
{ {
protected $em; protected $em;
protected $productCategoryRepository ;
protected $productCategoryRepository;


public function __construct(EntityManagerInterface $entityManager, ProductCategoryRepository $productCategoryRepository) public function __construct(EntityManagerInterface $entityManager, ProductCategoryRepository $productCategoryRepository)
{ {
$this->em = $entityManager; $this->em = $entityManager;
$this->productCategoryRepository = $productCategoryRepository ;
$this->productCategoryRepository = $productCategoryRepository;
} }


public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)


foreach ($categories as $category) { foreach ($categories as $category) {
$builder->add('category_' . $category->getId(), CheckboxType::class, [ $builder->add('category_' . $category->getId(), CheckboxType::class, [
'label' => $category->getStatus() == 0 ? $category->getTitle() .' (hors ligne)': $category->getTitle() ,
'label' => $category->getStatus() == 0 ? $category->getTitle() . ' (hors ligne)' : $category->getTitle(),
'data' => $currentProductCategories->contains($category), 'data' => $currentProductCategories->contains($category),
'required' => false, 'required' => false,
'disabled'=>true,
'attr'=>[
'class'=>'none'
]
'disabled' => true,
'attr' => [
'class' => 'none',
'data-section' => $category->getSection()->getId()
],
]); ]);
$childrenCategories = $this->productCategoryRepository->findAllByParent($category, true); $childrenCategories = $this->productCategoryRepository->findAllByParent($category, true);
foreach ($childrenCategories as $children) { foreach ($childrenCategories as $children) {
$builder->add('category_children_' . $children->getId(), CheckboxType::class, [ $builder->add('category_children_' . $children->getId(), CheckboxType::class, [
'label' => $children->getStatus() == 0 ? $children->getTitle() .' (hors ligne)': $children->getTitle() ,
'label' => $children->getStatus() == 0 ? $children->getTitle() . ' (hors ligne)' : $children->getTitle(),
'data' => $currentProductCategories->contains($children), 'data' => $currentProductCategories->contains($children),
'required' => false
'required' => false,
'attr' => [
'data-section' => $category->getSection()->getId()
],

]); ]);
} }
} }

+ 17
- 17
ShopBundle/Form/Backend/ProductFamily/ProductType.php View File

$this->em = $entityManager; $this->em = $entityManager;
$this->utils = $utils; $this->utils = $utils;
} }

public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)
{ {




$builder->add('title', TextType::class, array( $builder->add('title', TextType::class, array(
"required" => false "required" => false
)) ;

));


$builder->add('quantity', NumberType::class, array( $builder->add('quantity', NumberType::class, array(
'label' => 'Quantité', 'label' => 'Quantité',
'required'=>false,
'required' => false,
'attr' => [ 'attr' => [
'append_html' => 'g' 'append_html' => 'g'
] ]
$unitClass = $this->em->getClassMetadata(UnitInterface::class)->getName(); $unitClass = $this->em->getClassMetadata(UnitInterface::class)->getName();


$builder->add('unit', EntityType::class, array( $builder->add('unit', EntityType::class, array(
'class'=> $unitClass,
'class' => $unitClass,
'data' => 0, 'data' => 0,
'required'=>false,
'required' => false,
'choice_attr' => function ($choice) { 'choice_attr' => function ($choice) {
return [ return [
'data-unit-reference' => $choice->getUnitReference(), 'data-unit-reference' => $choice->getUnitReference(),


$builder->add('buyingPrice', NumberType::class, array( $builder->add('buyingPrice', NumberType::class, array(
'label' => 'Prix d\'achat', 'label' => 'Prix d\'achat',
'required'=>false
'required' => false
)); ));


$builder->add('buyingPriceWithTax', NumberType::class, array( $builder->add('buyingPriceWithTax', NumberType::class, array(


$builder->add('buyingPriceByRefUnit', NumberType::class, array( $builder->add('buyingPriceByRefUnit', NumberType::class, array(
'label' => 'Prix d\'achat', 'label' => 'Prix d\'achat',
'required'=>false
'required' => false
)); ));


$builder->add('buyingPriceByRefUnitWithTax', NumberType::class, array( $builder->add('buyingPriceByRefUnitWithTax', NumberType::class, array(
)); ));
$builder->add('multiplyingFactor', NumberType::class, array( $builder->add('multiplyingFactor', NumberType::class, array(
'label' => 'Coefficiant de multiplication', 'label' => 'Coefficiant de multiplication',
'mapped'=>false,
'required'=>false
'mapped' => false,
'required' => false
)); ));


$builder->add('priceByRefUnit', NumberType::class, array( $builder->add('priceByRefUnit', NumberType::class, array(
'required'=>false
'required' => false
)); ));


$builder->add('priceByRefUnitWithTax', NumberType::class, array( $builder->add('priceByRefUnitWithTax', NumberType::class, array(
$builder->add('position', HiddenType::class); $builder->add('position', HiddenType::class);
$builder->add('status', HiddenType::class); $builder->add('status', HiddenType::class);
$builder->add('exportTitle', TextType::class, array( $builder->add('exportTitle', TextType::class, array(
'required' =>false
'required' => false
)); ));
$builder->add('exportNote', TextType::class, array( $builder->add('exportNote', TextType::class, array(
'required' =>false
'required' => false
)); ));
$reductionCartClass = $this->em->getClassMetadata(ReductionCartInterface::class)->getName(); $reductionCartClass = $this->em->getClassMetadata(ReductionCartInterface::class)->getName();
$reductionCartRepo = $this->em->getRepository(ReductionCartInterface::class); $reductionCartRepo = $this->em->getRepository(ReductionCartInterface::class);


/* $builder->add('giftVoucherReductionCart', EntityType::class, array(
'required' =>false,
'class'=> $reductionCartClass,
'choices' => $reductionCartRepo->getOnlineReductionCart(),
));*/
/* $builder->add('giftVoucherReductionCart', EntityType::class, array(
'required' =>false,
'class'=> $reductionCartClass,
'choices' => $reductionCartRepo->getOnlineReductionCart(),
));*/


} }



+ 78
- 0
ShopBundle/Form/Backend/Ticket/TicketTypeType.php View File

<?php

namespace Lc\ShopBundle\Form\Backend\Ticket;

use App\Entity\Product;
use Doctrine\ORM\EntityManagerInterface;
use Lc\ShopBundle\Context\CreditHistoryInterface;
use Lc\ShopBundle\Context\OrderProductInterface;
use Lc\ShopBundle\Context\OrderReductionCartInterface;
use Lc\ShopBundle\Context\OrderShopInterface;
use Lc\ShopBundle\Context\OrderUtilsInterface;
use Lc\ShopBundle\Context\ProductInterface;
use Lc\ShopBundle\Context\ReductionCartInterface;
use Lc\ShopBundle\Context\ReductionCreditInterface;
use Lc\ShopBundle\Context\TicketInterface;
use Lc\ShopBundle\Context\TicketMessageInterface;
use Lc\ShopBundle\Form\DataTransformer\ProductToIdTransformer;
use Lc\ShopBundle\Model\CreditHistory;
use Lc\ShopBundle\Model\Ticket;
use Lc\ShopBundle\Services\Utils;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ButtonType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\MoneyType;
use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\OptionsResolver\OptionsResolver;

class TicketTypeType extends AbstractType
{
protected $em;


public function __construct(EntityManagerInterface $em)
{
$this->em = $em;
}

public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event){
$builder = $event->getForm()->getParent();

$builder->add('type', ChoiceType::class, [
'label' => 'field.Ticket.type',
'multiple' => false,
'expanded' => false,
'choices' => [
'field.Ticket.typeOptions.' . Ticket::TYPE_MESSAGE_FROM_PDL => Ticket::TYPE_MESSAGE_FROM_PDL,
'field.Ticket.typeOptions.' . Ticket::TYPE_GENERAL_QUESTION => Ticket::TYPE_GENERAL_QUESTION,
'field.Ticket.typeOptions.' . Ticket::TYPE_PRODUCT_UNAVAILABLE => Ticket::TYPE_PRODUCT_UNAVAILABLE,
'field.Ticket.typeOptions.' . Ticket::TYPE_PRODUCT_ERROR => Ticket::TYPE_PRODUCT_ERROR,
'field.Ticket.typeOptions.' . Ticket::TYPE_TECHNICAL_PROBLEM => Ticket::TYPE_TECHNICAL_PROBLEM,
'field.Ticket.typeOptions.' . Ticket::TYPE_POULTRY_BOOKING => Ticket::TYPE_POULTRY_BOOKING,
],
'translation_domain' => 'lcshop',
]);
});

}

public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'data_class' => $this->em->getClassMetadata(TicketInterface::class)->getName(),
'translation_domain' => 'lcshop'
]);
}
}

+ 2
- 0
ShopBundle/Form/Frontend/RegistrationType.php View File

'translation_domain' => 'lcshop', 'translation_domain' => 'lcshop',
]) ])
->add('subscribeNewsletter', CheckboxType::class, [ ->add('subscribeNewsletter', CheckboxType::class, [
'data' => true,
'label' => 'field.default.subscribeNewsletter', 'label' => 'field.default.subscribeNewsletter',
'required' => false, 'required' => false,
'mapped' => false, 'mapped' => false,
'translation_domain' => 'lcshop', 'translation_domain' => 'lcshop',
'help' => 'Un seul mail par semaine qui annonce l’ouverture des ventes, les nouveautés et promotions de la semaine ainsi que des informations utiles.'
]); ]);


// captcha // captcha

+ 18
- 1
ShopBundle/Model/OrderShop.php View File

*/ */
protected $updatedBy; protected $updatedBy;



/** /**
* @ORM\OneToMany(targetEntity="Lc\ShopBundle\Context\TicketInterface", mappedBy="orderShop") * @ORM\OneToMany(targetEntity="Lc\ShopBundle\Context\TicketInterface", mappedBy="orderShop")
*/ */
protected $tickets; protected $tickets;


/**
* @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\SectionInterface", inversedBy="orderShops")
* @ORM\JoinColumn(nullable=false)
*/
protected $section;

public function __construct() public function __construct()
{ {
$this->orderStatusHistories = new ArrayCollection(); $this->orderStatusHistories = new ArrayCollection();
return false ; return false ;
} }


public function getSection(): ?Section
{
return $this->section;
}

public function setSection(?Section $section): self
{
$this->section = $section;

return $this;
}

} }

+ 31
- 6
ShopBundle/Model/ProductCategory.php View File



namespace Lc\ShopBundle\Model; namespace Lc\ShopBundle\Model;


use App\Entity\Hub;
use App\Entity\ProductFamily;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
protected $childrens; protected $childrens;


/** /**
* @ORM\ManyToMany(targetEntity="App\Entity\ProductFamily", mappedBy="productCategories")
* @ORM\ManyToMany(targetEntity="Lc\ShopBundle\Context\ProductFamilyInterface", mappedBy="productCategories")
*/ */
protected $productFamilies; protected $productFamilies;


*/ */
protected $saleStatus; protected $saleStatus;



/**
* @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\SectionInterface", inversedBy="productCategories")
* @ORM\JoinColumn(nullable=false)
*/
protected $section;

public function __construct() public function __construct()
{ {
$this->childrens = new ArrayCollection(); $this->childrens = new ArrayCollection();


public function __toString() public function __toString()
{ {
// TODO: Implement __toString() method.
return $this->getTitle();
$parent = $this->getParent() ;
$title = $parent ? $parent->getTitle().' - ' : '' ;
$title .= $this->getTitle() ;
return $title ;
} }


public function getParent(): ?self public function getParent(): ?self
*/ */
public function getChildrens(): Collection public function getChildrens(): Collection
{ {
return $this->childrens;
//TODO les lignes ci-dessous ne devraient pas exister, sert à résoudre le problème d'ordre dans le menu
$iterator = $this->childrens->getIterator();
$iterator->uasort(function ($a, $b) {
return ($a->getPosition() < $b->getPosition()) ? -1 : 1;
});
return new ArrayCollection(iterator_to_array($iterator));
} }


public function addChildren(self $productCategory): self public function addChildren(self $productCategory): self


return $this; return $this;
} }

public function getSection(): ?Section
{
return $this->section;
}

public function setSection(?Section $section): self
{
$this->section = $section;

return $this;
}

} }

+ 31
- 1
ShopBundle/Model/ProductFamily.php View File

*/ */
protected $behaviorPrice; protected $behaviorPrice;



/** /**
* @ORM\Column(type="boolean") * @ORM\Column(type="boolean")
*/ */
protected $saleStatus; protected $saleStatus;


/**
* @ORM\ManyToMany(targetEntity="Lc\ShopBundle\Context\SectionInterface", inversedBy="productFamilies")
*/
protected $sections;

public function __construct() public function __construct()
{ {
$this->productCategories = new ArrayCollection(); $this->productCategories = new ArrayCollection();


return $this; return $this;
} }

/**
* @return Collection|Section[]
*/
public function getSections(): Collection
{
return $this->sections;
}

public function addSection(Section $section): self
{
if (!$this->sections->contains($section)) {
$this->sections[] = $section;
}

return $this;
}

public function removeSection(Section $section): self
{
if ($this->sections->contains($section)) {
$this->sections->removeElement($section);
}

return $this;
}
} }

+ 172
- 0
ShopBundle/Model/Section.php View File

<?php

namespace Lc\ShopBundle\Model;

use App\Entity\Hub;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Lc\ShopBundle\Context\FilterMerchantInterface;

/**
* @ORM\MappedSuperclass()
*/
abstract class Section extends AbstractDocumentEntity implements FilterMerchantInterface
{
/**
* @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\MerchantInterface")
* @ORM\JoinColumn(nullable=false)
*/
protected $merchant;

/**
* @ORM\Column(type="string", length=32)
*/
protected $cycle;

const SECTION_CYCLE_DAY = 'day' ;
const SECTION_CYCLE_WEEK = 'week' ;
const SECTION_CYCLE_MONTH = 'month' ;
const SECTION_CYCLE_YEAR = 'year' ;

/**
* @ORM\ManyToMany(targetEntity="Lc\ShopBundle\Context\ProductFamilyInterface", mappedBy="sections")
*/
protected $productFamilies;

/**
* @ORM\OneToMany(targetEntity="Lc\ShopBundle\Context\OrderShopInterface", mappedBy="section")
*/
protected $orderShops;


/**
* @ORM\OneToMany(targetEntity="Lc\ShopBundle\Context\ProductCategoryInterface", mappedBy="section")
*/
protected $productCategories;

public function __construct()
{
$this->productFamilies = new ArrayCollection();
$this->orderShops = new ArrayCollection();
}

public function __toString()
{
return $this->getTitle();
}

public function getMerchant(): ?Hub
{
return $this->merchant;
}

public function setMerchant(?Hub $merchant): self
{
$this->merchant = $merchant;

return $this;
}

public function getCycle(): ?string
{
return $this->cycle;
}

public function setCycle(string $cycle): self
{
$this->cycle = $cycle;

return $this;
}

/**
* @return Collection|ProductFamily[]
*/
public function getProductFamilies(): Collection
{
return $this->productFamilies;
}

public function addProductFamily(ProductFamily $productFamily): self
{
if (!$this->productFamilies->contains($productFamily)) {
$this->productFamilies[] = $productFamily;
$productFamily->addSection($this);
}

return $this;
}

public function removeProductFamily(ProductFamily $productFamily): self
{
if ($this->productFamilies->contains($productFamily)) {
$this->productFamilies->removeElement($productFamily);
$productFamily->removeSection($this);
}

return $this;
}

/**
* @return Collection|OrderShop[]
*/
public function getOrderShops(): Collection
{
return $this->orderShops;
}

public function addOrderShop(OrderShop $orderShop): self
{
if (!$this->orderShops->contains($orderShop)) {
$this->orderShops[] = $orderShop;
$orderShop->setSection($this);
}

return $this;
}

public function removeOrderShop(OrderShop $orderShop): self
{
if ($this->orderShops->contains($orderShop)) {
$this->orderShops->removeElement($orderShop);
// set the owning side to null (unless already changed)
if ($orderShop->getSection() === $this) {
$orderShop->setSection(null);
}
}

return $this;
}

/**
* @return Collection|ProductCategory[]
*/
public function getProductCategories(): Collection
{
return $this->productCategories;
}

public function addProductCategory(ProductCategory $productCategory): self
{
if (!$this->productCategories->contains($productCategory)) {
$this->productCategories[] = $productCategory;
$productCategory->setSection($this);
}

return $this;
}

public function removeProductCategory(ProductCategory $productCategory): self
{
if ($this->productCategories->contains($productCategory)) {
$this->productCategories->removeElement($productCategory);
// set the owning side to null (unless already changed)
if ($productCategory->getSection() === $this) {
$productCategory->setSection(null);
}
}

return $this;
}
}

+ 1
- 0
ShopBundle/Model/Ticket.php View File

const TYPE_TECHNICAL_PROBLEM = 'technical-problem' ; const TYPE_TECHNICAL_PROBLEM = 'technical-problem' ;
const TYPE_GENERAL_QUESTION = 'general-question' ; const TYPE_GENERAL_QUESTION = 'general-question' ;
const TYPE_POULTRY_BOOKING = 'poultry-booking' ; const TYPE_POULTRY_BOOKING = 'poultry-booking' ;
const TYPE_MESSAGE_FROM_PDL = 'message-from-pdl' ;




const TICKET_STATUS_OPEN = 'open' ; const TICKET_STATUS_OPEN = 'open' ;

+ 4
- 0
ShopBundle/Repository/OrderShopRepository.php View File

$query->select( $params['select']); $query->select( $params['select']);
} }


if (isset($params['section'])) {
$query = $query->andWhere('e.section = :section')->setParameter('section', $params['section']);
}

if (isset($params['dateStart']) || isset($params['dateEnd'])) { if (isset($params['dateStart']) || isset($params['dateEnd'])) {
$params['dateField'] = isset($params['dateField']) ? $params['dateField'] : 'validationDate'; $params['dateField'] = isset($params['dateField']) ? $params['dateField'] : 'validationDate';
} }

+ 13
- 1
ShopBundle/Repository/ProductCategoryRepository.php View File

return $query->getQuery()->getOneOrNullResult() ; return $query->getQuery()->getOneOrNullResult() ;
} }


public function findOneByDevAlias($devAlias)
{
$query = $this->findByMerchantQuery() ;
$query->andWhere('e.devAlias = :devAlias')->setParameter('devAlias',$devAlias) ;
return $query->getQuery()->getOneOrNullResult() ;
}

public function findAllParents($withOffline = false) public function findAllParents($withOffline = false)
{ {
$query = $this->findByMerchantQuery() $query = $this->findByMerchantQuery()
return $query->getQuery()->getResult(); return $query->getQuery()->getResult();
} }


public function findAllByParent($parentCategory, $withOffline = false, $withEmptyCategories = true)
public function findAllByParent($parentCategory, $withOffline = false, $withEmptyCategories = true, $filterBySpecificDay = false)
{ {
$query = $this->createQueryBuilder('e'); $query = $this->createQueryBuilder('e');
$query->andWhere('e.parent = :idParentCategory'); $query->andWhere('e.parent = :idParentCategory');
$query->andWhere('pf.status = 1') ; $query->andWhere('pf.status = 1') ;
} }


if($filterBySpecificDay) {
$query->andWhere('e.displaySpecificDay IS NULL OR e.displaySpecificDay = :dayToday') ;
$query->setParameter('dayToday', date('N')) ;
}

$query->addOrderBy('e.position', 'ASC') ; $query->addOrderBy('e.position', 'ASC') ;


return $query->getQuery()->getResult(); return $query->getQuery()->getResult();

+ 18
- 1
ShopBundle/Repository/ProductFamilyRepository.php View File

$query = $this->findByMerchantQuery() ; $query = $this->findByMerchantQuery() ;
$query = $this->joinRelations($query) ; $query = $this->joinRelations($query) ;
$query->andWhere('e.status = 1') ; $query->andWhere('e.status = 1') ;
$query->orderBy('RAND()');
return $query->getQuery()->getResult() ; return $query->getQuery()->getResult() ;
} }


$query->andWhere('e.status = 1'); $query->andWhere('e.status = 1');
$query->andWhere(':now <= e.propertyNoveltyExpirationDate') $query->andWhere(':now <= e.propertyNoveltyExpirationDate')
->setParameter('now', new \DateTime()) ; ->setParameter('now', new \DateTime()) ;
$query->orderBy('e.createdAt', 'DESC');
$query->orderBy('RAND()');


return $query->getQuery()->getResult() ; return $query->getQuery()->getResult() ;
} }
return $query->getQuery()->getResult() ; return $query->getQuery()->getResult() ;
} }


public function getProductFamiliesBySection($section, $maxResults = false, $sortField = 'productCategories.position', $sortDirection = 'ASC')
{
$query = $this->findByMerchantQuery() ;
$query = $this->joinRelations($query) ;

$query->andWhere(':section MEMBER OF e.sections')
->setParameter('section', $section) ;
$query->leftJoin('e.productCategories', 'productCategories');
if($sortField){
$query->orderBy($sortField,$sortDirection);
}
if($maxResults) {
$query->setMaxResults($maxResults) ;
}


return $query->getQuery()->getResult() ;
}




} }

+ 50
- 0
ShopBundle/Repository/SectionRepository.php View File

<?php

namespace Lc\ShopBundle\Repository;

use Lc\ShopBundle\Context\SectionInterface;
use Lc\ShopBundle\Context\DefaultRepositoryInterface;

/**
* @method SectionInterface|null find($id, $lockMode = null, $lockVersion = null)
* @method SectionInterface|null findOneBy(array $criteria, array $orderBy = null)
* @method SectionInterface[] findAll()
* @method SectionInterface[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*/
class SectionRepository extends BaseRepository implements DefaultRepositoryInterface
{
public function getInterfaceClass()
{
return SectionInterface::class;
}

// /**
// * @return Address[] Returns an array of Address objects
// */
/*
public function findByExampleField($value)
{
return $this->createQueryBuilder('a')
->andWhere('a.exampleField = :val')
->setParameter('val', $value)
->orderBy('a.id', 'ASC')
->setMaxResults(10)
->getQuery()
->getResult()
;
}
*/

/*
public function findOneBySomeField($value): ?Address
{
return $this->createQueryBuilder('a')
->andWhere('a.exampleField = :val')
->setParameter('val', $value)
->getQuery()
->getOneOrNullResult()
;
}
*/
}


+ 81
- 64
ShopBundle/Resources/public/css/backend/custom.css View File

min-width: 170px; min-width: 170px;
} }


/* Sortable */
/*************************** PAGINATION *******************************/
/* line 152, ../../sass/backend/custom.scss */
.pagination {
justify-content: center;
}

/* line 153, ../../sass/backend/custom.scss */
.disabled .page-link {
color: #343a40;
}

/* line 154, ../../sass/backend/custom.scss */ /* line 154, ../../sass/backend/custom.scss */
.disabled .page-link:hover, .page-link.current:hover {
background-color: #fff;
cursor: default;
}

/* Sortable */
/* line 159, ../../sass/backend/custom.scss */
.ui-sortable-helper { .ui-sortable-helper {
display: table; display: table;
} }


/* line 155, ../../sass/backend/custom.scss */
/* line 160, ../../sass/backend/custom.scss */
.ui-state-highlight { .ui-state-highlight {
background: #eee; background: #eee;
} }


/* line 156, ../../sass/backend/custom.scss */
/* line 161, ../../sass/backend/custom.scss */
.lc-sortable div:last-child { .lc-sortable div:last-child {
display: none; display: none;
} }
.lc-ckfinder-wrap .lc-ckfinder-button{width: 100%; bottom: 0px; left: 0; position: absolute;} .lc-ckfinder-wrap .lc-ckfinder-button{width: 100%; bottom: 0px; left: 0; position: absolute;}
*/ */
/* VUES JS */ /* VUES JS */
/* line 171, ../../sass/backend/custom.scss */
/* line 176, ../../sass/backend/custom.scss */
.nav-item .btn { .nav-item .btn {
padding-right: 15px; padding-right: 15px;
position: relative; position: relative;
} }


/* line 172, ../../sass/backend/custom.scss */
/* line 177, ../../sass/backend/custom.scss */
.nav-item .btn .invalid-form { .nav-item .btn .invalid-form {
display: none; display: none;
position: absolute; position: absolute;
font-size: 1.2rem; font-size: 1.2rem;
} }


/* line 173, ../../sass/backend/custom.scss */
/* line 178, ../../sass/backend/custom.scss */
.nav-item.has-invalid .btn .invalid-form { .nav-item.has-invalid .btn .invalid-form {
display: inline-block; display: inline-block;
z-index: 2; z-index: 2;
} }


/* ProductFamily */ /* ProductFamily */
/* line 178, ../../sass/backend/custom.scss */
/* line 183, ../../sass/backend/custom.scss */
.field-unit-quantity { .field-unit-quantity {
border-bottom: 2px dotted #eee; border-bottom: 2px dotted #eee;
padding-bottom: 10px; padding-bottom: 10px;
margin-bottom: 20px; margin-bottom: 20px;
} }


/* line 179, ../../sass/backend/custom.scss */
/* line 184, ../../sass/backend/custom.scss */
.field-reduction-apply { .field-reduction-apply {
border-top: 2px dotted #eee; border-top: 2px dotted #eee;
padding-top: 10px; padding-top: 10px;
margin-top: 20px; margin-top: 20px;
} }


/* line 181, ../../sass/backend/custom.scss */
/* line 186, ../../sass/backend/custom.scss */
.new-productfamily #nav-params, .new-productfamily #nav-params,
.edit-productfamily #nav-params { .edit-productfamily #nav-params {
margin-bottom: 30px; margin-bottom: 30px;
} }


/* line 186, ../../sass/backend/custom.scss */
/* line 191, ../../sass/backend/custom.scss */
.new-productfamily #nav-params .btn, .new-productfamily #nav-params .btn,
.edit-productfamily #nav-params .btn { .edit-productfamily #nav-params .btn {
margin-left: 20px; margin-left: 20px;
} }


/* line 191, ../../sass/backend/custom.scss */
/* line 196, ../../sass/backend/custom.scss */
.new-productfamily #product-categories .row, .new-productfamily #product-categories .row,
.edit-productfamily #product-categories .row { .edit-productfamily #product-categories .row {
padding: 10px; padding: 10px;
} }


/* line 196, ../../sass/backend/custom.scss */
/* line 201, ../../sass/backend/custom.scss */
.new-productfamily #product-categories .form-group, .new-productfamily #product-categories .form-group,
.edit-productfamily #product-categories .form-group { .edit-productfamily #product-categories .form-group {
width: 100%; width: 100%;
padding: 4px; padding: 4px;
} }


/* line 202, ../../sass/backend/custom.scss */
/* line 207, ../../sass/backend/custom.scss */
.new-productfamily #product-categories .children, .new-productfamily #product-categories .children,
.edit-productfamily #product-categories .children { .edit-productfamily #product-categories .children {
margin-left: 20px; margin-left: 20px;
width: 100%; width: 100%;
} }


/* line 208, ../../sass/backend/custom.scss */
/* line 213, ../../sass/backend/custom.scss */
.new-productfamily ul.products, .new-productfamily ul.products,
.edit-productfamily ul.products { .edit-productfamily ul.products {
padding: 0px; padding: 0px;
list-style-type: none; list-style-type: none;
} }


/* line 214, ../../sass/backend/custom.scss */
/* line 219, ../../sass/backend/custom.scss */
.new-productfamily ul.products li.product, .new-productfamily ul.products li.product,
.edit-productfamily ul.products li.product { .edit-productfamily ul.products li.product {
padding: 0px; padding: 0px;
position: relative; position: relative;
} }


/* line 221, ../../sass/backend/custom.scss */
/* line 226, ../../sass/backend/custom.scss */
.new-productfamily ul.products li.add, .new-productfamily ul.products li.add,
.edit-productfamily ul.products li.add { .edit-productfamily ul.products li.add {
text-align: right; text-align: right;
} }


/* line 226, ../../sass/backend/custom.scss */
/* line 231, ../../sass/backend/custom.scss */
.autoresize textarea { .autoresize textarea {
height: auto; height: auto;
min-height: 38px; min-height: 38px;
} }


/* line 228, ../../sass/backend/custom.scss */
/* line 233, ../../sass/backend/custom.scss */
.field-price .input-group.buyingPrice input, .field-price .input-group.buyingPrice .input-group-text { .field-price .input-group.buyingPrice input, .field-price .input-group.buyingPrice .input-group-text {
font-weight: bold; font-weight: bold;
border-color: #222; border-color: #222;
} }


/* line 229, ../../sass/backend/custom.scss */
/* line 234, ../../sass/backend/custom.scss */
.field-price .input-group.buyingPriceByRefUnit input, .field-price .input-group.buyingPriceByRefUnit .input-group-text { .field-price .input-group.buyingPriceByRefUnit input, .field-price .input-group.buyingPriceByRefUnit .input-group-text {
font-weight: bold; font-weight: bold;
border-color: #222; border-color: #222;
} }


/* line 230, ../../sass/backend/custom.scss */
/* line 235, ../../sass/backend/custom.scss */
.field-price .input-group.priceWithTax input, .field-price .input-group.priceWithTax .input-group-text { .field-price .input-group.priceWithTax input, .field-price .input-group.priceWithTax .input-group-text {
font-weight: bold; font-weight: bold;
border-color: #222; border-color: #222;
} }


/* line 231, ../../sass/backend/custom.scss */
/* line 236, ../../sass/backend/custom.scss */
.field-price .input-group.priceByRefUnitWithTax input, .field-price .input-group.priceByRefUnitWithTax .input-group-text { .field-price .input-group.priceByRefUnitWithTax input, .field-price .input-group.priceByRefUnitWithTax .input-group-text {
font-weight: bold; font-weight: bold;
border-color: #222; border-color: #222;
} }


/* line 232, ../../sass/backend/custom.scss */
/* line 237, ../../sass/backend/custom.scss */
.input-group.multiplyingFactor input, .input-group.multiplyingFactor .input-group-text { .input-group.multiplyingFactor input, .input-group.multiplyingFactor .input-group-text {
font-weight: bold; font-weight: bold;
border-color: #222; border-color: #222;
} }


/* ORDER */ /* ORDER */
/* line 238, ../../sass/backend/custom.scss */
/* line 243, ../../sass/backend/custom.scss */
.table-order-summary { .table-order-summary {
width: 100%; width: 100%;
} }


/* line 241, ../../sass/backend/custom.scss */
/* line 246, ../../sass/backend/custom.scss */
.order-product-item.redelivery { .order-product-item.redelivery {
background: rgba(18, 104, 253, 0.38) !important; background: rgba(18, 104, 253, 0.38) !important;
} }
/*.select2-container--bootstrap .select2-selection{max-width: none;}*/ /*.select2-container--bootstrap .select2-selection{max-width: none;}*/
/*.order-product-item{margin: 15px 0; padding: 0;}*/ /*.order-product-item{margin: 15px 0; padding: 0;}*/
/* Product */ /* Product */
/* line 246, ../../sass/backend/custom.scss */
/* line 251, ../../sass/backend/custom.scss */
.product-form-modal { .product-form-modal {
display: none; display: none;
} }


/* line 247, ../../sass/backend/custom.scss */
/* line 252, ../../sass/backend/custom.scss */
.product-form.modal .form-check-label { .product-form.modal .form-check-label {
font-style: italic; font-style: italic;
color: #666; color: #666;
text-align: left; text-align: left;
} }


/* line 248, ../../sass/backend/custom.scss */
/* line 253, ../../sass/backend/custom.scss */
.products-collection-table .inherited { .products-collection-table .inherited {
color: #888; color: #888;
font-style: italic; font-style: italic;
font-weight: initial; font-weight: initial;
} }


/* line 249, ../../sass/backend/custom.scss */
/* line 254, ../../sass/backend/custom.scss */
.products-collection-table td { .products-collection-table td {
position: relative; position: relative;
} }


/* line 250, ../../sass/backend/custom.scss */
/* line 255, ../../sass/backend/custom.scss */
.card-body.p-0 .products-collection-table tbody > tr > td:first-of-type, .card-body.p-0 .products-collection-table tbody > tr > th:first-of-type, .card-body.p-0 .products-collection-table thead > tr > td:first-of-type, .card-body.p-0 .products-collection-table thead > tr > th:first-of-type { .card-body.p-0 .products-collection-table tbody > tr > td:first-of-type, .card-body.p-0 .products-collection-table tbody > tr > th:first-of-type, .card-body.p-0 .products-collection-table thead > tr > td:first-of-type, .card-body.p-0 .products-collection-table thead > tr > th:first-of-type {
padding-left: 0.35rem; padding-left: 0.35rem;
} }


/* line 251, ../../sass/backend/custom.scss */
/* line 256, ../../sass/backend/custom.scss */
.products-collection-table .btn-empty-field { .products-collection-table .btn-empty-field {
position: absolute; position: absolute;
right: 3px; right: 3px;
padding: 0px; padding: 0px;
} }


/* line 252, ../../sass/backend/custom.scss */
/* line 257, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table { #lc-product-family-edit .products-collection-table {
table-layout: fixed; table-layout: fixed;
/* background-clip: padding-box;*/ /* background-clip: padding-box;*/
border-collapse: collapse; border-collapse: collapse;
} }


/* line 253, ../../sass/backend/custom.scss */
/* line 258, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table th { #lc-product-family-edit .products-collection-table th {
font-size: 13px; font-size: 13px;
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
position: relative; position: relative;
} }


/* line 254, ../../sass/backend/custom.scss */
/* line 259, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table tfoot th { #lc-product-family-edit .products-collection-table tfoot th {
border-top: 2px solid #dee2e6; border-top: 2px solid #dee2e6;
} }


/* line 255, ../../sass/backend/custom.scss */
/* line 260, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table th span { #lc-product-family-edit .products-collection-table th span {
white-space: initial; white-space: initial;
} }


/* line 256, ../../sass/backend/custom.scss */
/* line 261, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table th:last-child { #lc-product-family-edit .products-collection-table th:last-child {
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
} }


/* line 257, ../../sass/backend/custom.scss */
/* line 262, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td { #lc-product-family-edit .products-collection-table td {
border-left: 1px solid #dee2e6; border-left: 1px solid #dee2e6;
text-align: center; text-align: center;
border-bottom: 1px solid #dee2e6; border-bottom: 1px solid #dee2e6;
} }


/* line 258, ../../sass/backend/custom.scss */
/* line 263, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td:last-child { #lc-product-family-edit .products-collection-table td:last-child {
border-right: 1px solid #dee2e6; border-right: 1px solid #dee2e6;
white-space: nowrap; white-space: nowrap;
} }


/* line 259, ../../sass/backend/custom.scss */
/* line 264, ../../sass/backend/custom.scss */
#lc-product-family-edit .btn-add-product { #lc-product-family-edit .btn-add-product {
margin: 20px 0; margin: 20px 0;
float: right; float: right;
} }


/* line 260, ../../sass/backend/custom.scss */
/* line 265, ../../sass/backend/custom.scss */
#lc-product-family-edit .inherited { #lc-product-family-edit .inherited {
color: #888; color: #888;
font-style: italic; font-style: italic;
font-weight: initial; font-weight: initial;
} }


/* line 261, ../../sass/backend/custom.scss */
/* line 266, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td .value { #lc-product-family-edit .products-collection-table td .value {
min-width: 80%; min-width: 80%;
margin: auto; margin: auto;
cursor: pointer; cursor: pointer;
} }


/* line 262, ../../sass/backend/custom.scss */
/* line 267, ../../sass/backend/custom.scss */
#lc-product-family-edit .products-collection-table td .modal { #lc-product-family-edit .products-collection-table td .modal {
text-align: left; text-align: left;
} }


/* line 263, ../../sass/backend/custom.scss */
/* line 268, ../../sass/backend/custom.scss */
table.products-collection-table th.main-info, td.buyingPrice, td.multiplyingFactor, td.priceWithTax { table.products-collection-table th.main-info, td.buyingPrice, td.multiplyingFactor, td.priceWithTax {
background: #eeeeee; background: #eeeeee;
background-clip: padding-box; background-clip: padding-box;
text-decoration: underline; text-decoration: underline;
} }


/* line 265, ../../sass/backend/custom.scss */
/* line 270, ../../sass/backend/custom.scss */
table.products-collection-table tr.disabled { table.products-collection-table tr.disabled {
opacity: 0.5; opacity: 0.5;
} }


/* line 266, ../../sass/backend/custom.scss */
/* line 271, ../../sass/backend/custom.scss */
.table-striped tbody .tr-sep { .table-striped tbody .tr-sep {
border-top: 2px solid #888; border-top: 2px solid #888;
} }


/* DeliveryZone */ /* DeliveryZone */
/* line 270, ../../sass/backend/custom.scss */
/* line 275, ../../sass/backend/custom.scss */
#autocomplete-cities { #autocomplete-cities {
position: relative; position: relative;
} }


/* line 274, ../../sass/backend/custom.scss */
/* line 279, ../../sass/backend/custom.scss */
#autocomplete-cities .ui-autocomplete { #autocomplete-cities .ui-autocomplete {
left: 30%; left: 30%;
top: 41px; top: 41px;
margin-left: 18px; margin-left: 18px;
} }


/* line 280, ../../sass/backend/custom.scss */
/* line 285, ../../sass/backend/custom.scss */
.head-reminders { .head-reminders {
margin-top: 15px; margin-top: 15px;
} }


/* TABLEAU DE BORD */ /* TABLEAU DE BORD */
/* line 283, ../../sass/backend/custom.scss */
/* line 288, ../../sass/backend/custom.scss */
.todo-list > li { .todo-list > li {
position: relative; position: relative;
} }


/* line 284, ../../sass/backend/custom.scss */
/* line 289, ../../sass/backend/custom.scss */
.todo-list > li .text { .todo-list > li .text {
margin-left: 30px; margin-left: 30px;
} }


/* line 285, ../../sass/backend/custom.scss */
/* line 290, ../../sass/backend/custom.scss */
.todo-list > li .tools { .todo-list > li .tools {
position: absolute; position: absolute;
top: 4px; top: 4px;
right: 15px; right: 15px;
} }


/* line 287, ../../sass/backend/custom.scss */
/* line 292, ../../sass/backend/custom.scss */
#addTicketMessageForm { #addTicketMessageForm {
margin-top: 30px; margin-top: 30px;
border-top: 2px dotted #eee; border-top: 2px dotted #eee;
padding-top: 30px; padding-top: 30px;
} }


/* line 289, ../../sass/backend/custom.scss */
/* line 294, ../../sass/backend/custom.scss */
#dashboard .list-btn-statistic { #dashboard .list-btn-statistic {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
} }


/* line 290, ../../sass/backend/custom.scss */
/* line 295, ../../sass/backend/custom.scss */
#dashboard .btn-statistic { #dashboard .btn-statistic {
width: 120px; width: 120px;
height: 70px; height: 70px;
line-height: 1rem; line-height: 1rem;
} }


/* line 291, ../../sass/backend/custom.scss */
/* line 296, ../../sass/backend/custom.scss */
#dashboard .btn-statistic small { #dashboard .btn-statistic small {
margin-bottom: 10px; margin-bottom: 10px;
display: block; display: block;
} }


/* line 292, ../../sass/backend/custom.scss */
/* line 297, ../../sass/backend/custom.scss */
#dashboard .btn-statistic .value { #dashboard .btn-statistic .value {
display: block; display: block;
} }


/* line 294, ../../sass/backend/custom.scss */
/* line 299, ../../sass/backend/custom.scss */
#dashboard #range_date_interval { #dashboard #range_date_interval {
margin-bottom: 20px; margin-bottom: 20px;
} }


/* line 295, ../../sass/backend/custom.scss */
/* line 300, ../../sass/backend/custom.scss */
#dashboard #range_date_interval label { #dashboard #range_date_interval label {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }


/* line 296, ../../sass/backend/custom.scss */
/* line 301, ../../sass/backend/custom.scss */
#dashboard #range_date_interval .form-check { #dashboard #range_date_interval .form-check {
float: left; float: left;
margin-right: 10px; margin-right: 10px;
} }


/* line 297, ../../sass/backend/custom.scss */
/* line 302, ../../sass/backend/custom.scss */
#dashboard .table-condensed .btn, #dashboard .table-condensed .btn-sm { #dashboard .table-condensed .btn, #dashboard .table-condensed .btn-sm {
white-space: nowrap; white-space: nowrap;
} }


/* Tickets */ /* Tickets */
/* line 303, ../../sass/backend/custom.scss */
/* line 308, ../../sass/backend/custom.scss */
#ticket-list .btn-sm { #ticket-list .btn-sm {
display: block; display: block;
} }


/* line 309, ../../sass/backend/custom.scss */
/* line 314, ../../sass/backend/custom.scss */
#toast-container { #toast-container {
width: 350px; width: 350px;
} }


/* line 310, ../../sass/backend/custom.scss */
/* line 315, ../../sass/backend/custom.scss */
.toast { .toast {
float: right; float: right;
} }


/* line 312, ../../sass/backend/custom.scss */
/* line 317, ../../sass/backend/custom.scss */
#toast-container:before:hover { #toast-container:before:hover {
opacity: 1; opacity: 1;
cursor: pointer; cursor: pointer;
} }


/* line 316, ../../sass/backend/custom.scss */
/* line 321, ../../sass/backend/custom.scss */
#toast-close-all { #toast-close-all {
border: 0; border: 0;
position: absolute; position: absolute;

+ 84
- 0
ShopBundle/Resources/public/js/backend/script/default/init-common.js View File

initButtonConfirm() initButtonConfirm()
initNotice(); initNotice();
initBtnEditReminder(); initBtnEditReminder();
initBtnWriteToUser();
initCollectionWidget()
$('form').on('focus', 'input[type=number]', function (e) { $('form').on('focus', 'input[type=number]', function (e) {
$(this).on('wheel.disableScroll', function (e) { $(this).on('wheel.disableScroll', function (e) {
e.preventDefault() e.preventDefault()
}); });


} }
function initBtnWriteToUser(){
$('#btn-ticket-write-to-user').on('click', function () {
$btn = $(this);
var order = '';
if($btn.data('order')) {
order = '&orderId=' + $btn.data('order');
}
$.ajax({
url: $btn.data('url'),
data: "user="+$btn.data('user')+order,
method: "POST",
dataType: "json",
success: function (response) {
$('body').append(response.modal);
initModalNewTicket();
}
});
});
}
function initModalNewTicket(){
$('#modal-new-ticket select.form-control').each(function (i, elm) {
if (!$(this).hasClass('disable-select2')) {
setSelect2($(elm));
}
});
$('#modal-new-ticket').modal('show');
log($('#modal-new-ticket .btn-save'));
$('#modal-new-ticket .btn-save').on('click', function (){
$form = $(this).parents('form');
if(checkFormValidity('#'+$form.prop('id'))) {
$('#modal-new-ticket').modal('hide');

$.ajax({
url: $form.prop('action'),
data: $form.serialize(),
method: $form.prop('method'),
dataType: "json",
success: function (response) {
setFlashMessages(response.flashMessages);
$('#modal-new-ticket').remove();
}
});
}
})
}


function initCollectionWidget(){
$('.form-widget-compound>div[data-prototype]').each(function (i,collectionWidget){
resetNumItemsCollectionField($(collectionWidget));
$(collectionWidget).on('easyadmin.collection.item-added', function (){
resetNumItemsCollectionField($(this));
})
});

}

function resetNumItemsCollectionField($collectionWidget){
numItems = $collectionWidget.children('div.form-group').length;
$collectionWidget.children('div.form-group').each(function (i,item){
$field = $(item).find('input[type="text"]');

//Chanegment ID
posId = $field.prop('id').lastIndexOf('_') + 1;
idPrefix = $field.prop('id').substr(0, posId);
$field.prop('id', idPrefix+i);

//Chanegment Name
posName = $field.prop('name').lastIndexOf('[') + 1;
namePrefix = $field.prop('name').substr(0, posName);
$field.prop('name', namePrefix+i+']');

$(item).find('.field-collection-item-action').remove();
$(item).find('.field-collection-item-row').append('<button style="border:0px; background: none; " class="field-collection-item-action field-collection-item-remove" type="button">&times;</button>');
});

$collectionWidget.find('.field-collection-item-remove').off('click');
$collectionWidget.find('.field-collection-item-remove').on('click', function (){
$(this).parents('.form-group:first').remove();
resetNumItemsCollectionField($collectionWidget);
});
}

+ 4
- 0
ShopBundle/Resources/public/js/backend/script/merchant/vuejs-merchant.js View File

{ {
name: 'maintenance', name: 'maintenance',
nameDisplay: 'Maintenance' nameDisplay: 'Maintenance'
},
{
name: 'lunch',
nameDisplay: 'Repas du midi'
} }
] ]
}, window.addressValues, window.merchantPanelOrderValues); }, window.addressValues, window.merchantPanelOrderValues);

+ 9
- 0
ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js View File

activeProducts: false, activeProducts: false,
giftVoucherActive: false, giftVoucherActive: false,
productsQuantityAsTitle: false, productsQuantityAsTitle: false,
section: null,
formProducts: {}, formProducts: {},
currentSection: 'general', currentSection: 'general',
sectionsArray: [ sectionsArray: [
} }


} }
this.sectionHasChanged();
this.initLcSortableProductsList(); this.initLcSortableProductsList();
}); });


if (typeof this.$refs.productUnitPrice !== 'undefined') { if (typeof this.$refs.productUnitPrice !== 'undefined') {
return this.$refs.productUnitPrice.behaviorPrice; return this.$refs.productUnitPrice.behaviorPrice;
} }
},
sectionHasChanged: function (){
$('.product-categories').find('.form-check-input:not(.none)').prop('disabled', true);
$('.product-categories').find('.form-check-input[data-section="'+this.section+'"]:not(.none)').prop('disabled', false);
} }
}, },
watch: { watch: {
title: function () { title: function () {
this.updateChild() this.updateChild()
}, },
section: function (){
this.sectionHasChanged()
},
propertyNoveltyExpirationDateActive: function () { propertyNoveltyExpirationDateActive: function () {
if(!this.propertyNoveltyExpirationDateActive){ if(!this.propertyNoveltyExpirationDateActive){
this.propertyNoveltyExpirationDate = null; this.propertyNoveltyExpirationDate = null;

+ 3
- 2
ShopBundle/Resources/public/js/backend/script/user/init-edit.js View File

dataType: "json", dataType: "json",
success: function (response) { success: function (response) {
setFlashMessages(response.flashMessages); setFlashMessages(response.flashMessages);
$('body').append(response.data);
$('body').append(response.data).ready(function () {
initCollectionWidget();
});
$('#modal-user-address').modal('show'); $('#modal-user-address').modal('show');
$('#modal-user-address').on('hidden.bs.modal', function (e) { $('#modal-user-address').on('hidden.bs.modal', function (e) {
$('#modal-user-address').remove(); $('#modal-user-address').remove();
appUserAddress = null; appUserAddress = null;
function initUserAddressForm(form, btn) { function initUserAddressForm(form, btn) {
appUserAddress = null; appUserAddress = null;

$(form).find('button').off('click'); $(form).find('button').off('click');
$(form).find('button').on('click', function () { $(form).find('button').on('click', function () {
if(checkFormValidity('#'+$(form).prop('id'))) { if(checkFormValidity('#'+$(form).prop('id'))) {

+ 6
- 0
ShopBundle/Resources/public/sass/backend/custom.scss View File

#switch-merchant { #switch-merchant {
min-width: 170px ; min-width: 170px ;
} }
/*************************** PAGINATION *******************************/
.pagination{justify-content: center;}
.disabled .page-link{color: #343a40;}
.disabled .page-link:hover, .page-link.current:hover{background-color: #fff; cursor: default;}



/* Sortable */ /* Sortable */


-webkit-box-shadow: 0 0 12px #999; -webkit-box-shadow: 0 0 12px #999;
box-shadow: 0 0 12px #999; box-shadow: 0 0 12px #999;
} }


+ 19
- 1
ShopBundle/Resources/translations/lcshop.fr.yaml View File

Statistic: Statistic:
title: Statistiques title: Statistiques
ProductFamily: ProductFamily:
status: Espaces et statuts
addresses: Livraisons & facturation addresses: Livraisons & facturation
main: Général main: Général
products: Déclinaisons products: Déclinaisons
email: Email email: Email
delivery: Livraison delivery: Livraison
maintenance: Maintenance maintenance: Maintenance
lunch: Repas du midi
Address: Address:
listLoopBesancon: Adresses de Besançon à spécifier (lat / long) listLoopBesancon: Adresses de Besançon à spécifier (lat / long)


editStockNoQuantityDefault: "Le stock n'a pas été modifié pour le produit #%id% (Aucune quantité par défaut)" editStockNoQuantityDefault: "Le stock n'a pas été modifié pour le produit #%id% (Aucune quantité par défaut)"
field: field:
default: default:
section: Espace
unit: Unité unit: Unité
placeholder: Choisissez une option placeholder: Choisissez une option
deliveryPointSale: Lieu de livraison deliveryPointSale: Lieu de livraison
purchaseOrderEmailContent: "Contenu par défaut de l'email envoyé aux producteurs" purchaseOrderEmailContent: "Contenu par défaut de l'email envoyé aux producteurs"
dateStart: Date de début dateStart: Date de début
dateEnd: Date de fin dateEnd: Date de fin
messageLunchOpen: Message (section ouverte)
messageLunchClosed: Message (section fermée)
displaySpecificDay: Disponible un jour spécifique
groupUsers: Groupes
ticketTypesNotification: Catégorie ticket


PointSale: PointSale:
code: Code code: Code
displayTotalWeightInPurchaseOrder: Afficher le poids total dans les bons de commande displayTotalWeightInPurchaseOrder: Afficher le poids total dans les bons de commande


ProductFamily: ProductFamily:
sections: Espace où le produit est vendu
taxRateInherited: Utiliser la TVA par défaut taxRateInherited: Utiliser la TVA par défaut
activeProducts: Activer les déclinaisons activeProducts: Activer les déclinaisons
productsType: Type de déclinaisons productsType: Type de déclinaisons
quantityOrder: Quantité commandé quantityOrder: Quantité commandé
quantityProduct: Quantité (en rapport à l'unité) quantityProduct: Quantité (en rapport à l'unité)
unit: Unité unit: Unité
OrderShopLunch:
deliveryTypeOptions:
point-sale: En ambassade
home: À domicile
OrderShop: OrderShop:
hasReach: Étape atteinte hasReach: Étape atteinte
deliveryTrucks: Véhicules de livraison deliveryTrucks: Véhicules de livraison
type: Catégorie type: Catégorie
message: Votre réponse message: Votre réponse
typeOptions: typeOptions:
message-from-pdl: Messsage de l'équipe Place du Local
general-question: Questions générales general-question: Questions générales
product-unavailable: Produit manquant product-unavailable: Produit manquant
product-error: Erreur sur un produit product-error: Erreur sur un produit
days: Par jour days: Par jour
week: Par semaine week: Par semaine
month: Par mois month: Par mois

User:
isSaleAlwaysOpen: Commandes toujours ouvertes
action: action:
apply: Appliquer apply: Appliquer
new: Créer %entity_label% new: Créer %entity_label%
logout: Me déconnecter logout: Me déconnecter
address: Adresse utilisateur address: Adresse utilisateur
switch: Prendre la main switch: Prendre la main

order: order:
addOrderProduct: Ajouter un produit addOrderProduct: Ajouter un produit
addReductionCart: Ajouter une réduction addReductionCart: Ajouter une réduction
add: Ajouter un pense-bête add: Ajouter un pense-bête
address: address:
add: Ajouter une adresse add: Ajouter une adresse
ticket:
writeToUser: Écrire à l'utilisateur
resetting: resetting:
check_email: | check_email: |
Un e-mail vous a été envoyé. Il contient un lien sur lequel il vous faudra cliquer pour réinitialiser votre mot de passe. Si vous ne recevez pas d'email, vérifiez votre dossier spam ou essayez à nouveau. Un e-mail vous a été envoyé. Il contient un lien sur lequel il vous faudra cliquer pour réinitialiser votre mot de passe. Si vous ne recevez pas d'email, vérifiez votre dossier spam ou essayez à nouveau.

+ 2
- 2
ShopBundle/Resources/views/backend/default/block/list_tickets.html.twig View File

<td>{{ ticket.subject }}</td> <td>{{ ticket.subject }}</td>
<td> <td>
{% set value = ticket.status %} {% set value = ticket.status %}
{% include '@LcShop/backend/default/list-fields/field_ticket_status.html.twig' %}
{% include '@LcShop/backend/default/field/ticket_status.html.twig' %}
</td> </td>
<td> <td>
{% set item = ticket %} {% set item = ticket %}
{% include '@LcShop/backend/default/list-fields/field_ticket_last_message.html.twig' %}
{% include '@LcShop/backend/default/field/ticket_last_message.html.twig' %}
</td> </td>
<td> <td>
<a class="btn-sm btn-success" href="{{ path('easyadmin', {id: ticket.id, entity: 'Ticket', action: 'show'}) }}"> <a class="btn-sm btn-success" href="{{ path('easyadmin', {id: ticket.id, entity: 'Ticket', action: 'show'}) }}">

+ 103
- 0
ShopBundle/Resources/views/backend/default/block/paginator.html.twig View File

{% trans_default_domain 'EasyAdminBundle' %}

{% set _paginator_request_parameters = _request_parameters|merge({'referer': null}) %}

{% if paginator.haveToPaginate %}
<div class="list-pagination">
<div class="row">
<div class="col-sm-3 hidden-xs list-pagination-counter">
{{ 'paginator.counter'|trans({ '%start%': paginator.currentPageOffsetStart, '%end%': paginator.currentPageOffsetEnd, '%results%': paginator.nbResults})|raw }}
</div>
<div class="col-xs-12 col-sm-9">
<ul class="pagination list-pagination-paginator {{ 1 == paginator.currentPage ? 'first-page' : '' }} {{ paginator.hasNextPage ? '' : 'last-page' }}">
{% if 1 == paginator.currentPage %}
<li class="disabled">
<span class="page-link ">
<i class="fa fa-angle-double-left"></i>
</span>
</li>
{% else %}
<li>
<a class="page-link"
href="{{ path('easyadmin', _paginator_request_parameters|merge({ page: 1 }) ) }}">
<i class="fa fa-angle-double-left"></i>
</a>
</li>
{% endif %}

{% if paginator.hasPreviousPage %}
<li>
<a class="page-link"
href="{{ path('easyadmin', _paginator_request_parameters|merge({ page: paginator.previousPage }) ) }}">
<i class="fa fa-angle-left"></i>
</a>
</li>
{% else %}
<li class="disabled">
<span class="page-link">
<i class="fa fa-angle-left"></i>
</span>
</li>
{% endif %}

{# BEGIN DISPLAYING PAGE NUMBERS #}

{# the number of pages that are displayed around the active page #}
{% set nearbyPagesLimit = 8 %}

{% if paginator.currentPage > 1 %}
{% for i in range(paginator.currentPage-nearbyPagesLimit, paginator.currentPage-1) if ( i > 0 ) %}
<li >
<a class="page-link"
href="{{ path('easyadmin', _paginator_request_parameters|merge({ page: i }) ) }}">{{ i }}</a>
</li>
{% endfor %}
{% endif %}
<li>
<a class="current page-link">{{ paginator.currentPage }}</a>
</li>
{% if paginator.currentPage < paginator.nbPages %}
{% for i in range(paginator.currentPage+1, paginator.currentPage + nearbyPagesLimit) if ( i <= paginator.nbPages ) %}
<li>
<a class="page-link"
href="{{ path('easyadmin', _paginator_request_parameters|merge({ page: i }) ) }}">{{ i }}</a>
</li>
{% endfor %}
{% endif %}

{# END DISPLAYING PAGE NUMBERS #}

{% if paginator.hasNextPage %}
<li>
<a class="page-link"
href="{{ path('easyadmin', _paginator_request_parameters|merge({ page: paginator.nextPage }) ) }}">
<i class="fa fa-angle-right"></i>
</a>
</li>
{% else %}
<li class="disabled">
<span class="page-link">
<i class="fa fa-angle-right"></i>
</span>
</li>
{% endif %}

{% if paginator.currentPage < paginator.nbPages %}
<li>
<a class="page-link"
href="{{ path('easyadmin', _paginator_request_parameters|merge({ page: paginator.nbPages }) ) }}">
<i class="fa fa-angle-double-right"></i>
</a>
</li>
{% else %}
<li class="disabled">
<span class="page-link">
<i class="fa fa-angle-double-right"></i>
</span>
</li>
{% endif %}
</ul>
</div>
</div>
</div>
{% endif %}

ShopBundle/Resources/views/backend/default/list-fields/list_association.html.twig → ShopBundle/Resources/views/backend/default/field/association.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/list_association_users.html.twig → ShopBundle/Resources/views/backend/default/field/association_users.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_badge.html.twig → ShopBundle/Resources/views/backend/default/field/badge.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/list_children.html.twig → ShopBundle/Resources/views/backend/default/field/children.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_date.html.twig → ShopBundle/Resources/views/backend/default/field/date.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_datetime.html.twig → ShopBundle/Resources/views/backend/default/field/datetime.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/list_day.html.twig → ShopBundle/Resources/views/backend/default/field/day.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_options_translatable.html.twig → ShopBundle/Resources/views/backend/default/field/options_translatable.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_price.html.twig → ShopBundle/Resources/views/backend/default/field/price.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_product_family_available_quantity.html.twig → ShopBundle/Resources/views/backend/default/field/product_family_available_quantity.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_product_family_total_product_ordered.html.twig → ShopBundle/Resources/views/backend/default/field/product_family_total_product_ordered.html.twig View File


+ 3
- 0
ShopBundle/Resources/views/backend/default/field/supplier.html.twig View File

{% if link_parameters is defined %}
<a href="{{ path('easyadmin', link_parameters|merge({entity: 'Supplier', referer: '' })) }}">{{ value|easyadmin_truncate }}</a>
{% endif %}

ShopBundle/Resources/views/backend/default/list-fields/field_ticket_last_message.html.twig → ShopBundle/Resources/views/backend/default/field/ticket_last_message.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_ticket_status.html.twig → ShopBundle/Resources/views/backend/default/field/ticket_status.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_toggle.html.twig → ShopBundle/Resources/views/backend/default/field/toggle.html.twig View File


ShopBundle/Resources/views/backend/default/list-fields/field_total.html.twig → ShopBundle/Resources/views/backend/default/field/total.html.twig View File


+ 20
- 5
ShopBundle/Resources/views/backend/default/list.html.twig View File

sortField: app.request.get('sortField'), sortField: app.request.get('sortField'),
sortDirection: app.request.get('sortDirection'), sortDirection: app.request.get('sortDirection'),
page: app.request.get('page', 1), page: app.request.get('page', 1),
maxResults: app.request.get('maxResults', _entity_config.list.max_results),
filters: app.request.get('filters', []), filters: app.request.get('filters', []),
referer: null referer: null
}) %} }) %}
{% set _has_filters = _entity_config.list.filters|default(false) %} {% set _has_filters = _entity_config.list.filters|default(false) %}


{% block body_id 'easyadmin-list-' ~ _entity_config.name %} {% block body_id 'easyadmin-list-' ~ _entity_config.name %}
{#{% block body_class 'list list-' ~ _entity_config.name|lower %}#}
{# {% block body_class 'list list-' ~ _entity_config.name|lower %} #}


{% block content_title %} {% block content_title %}
{% apply spaceless %} {% apply spaceless %}
{% endblock %} {% endblock %}


{% block global_actions %} {% block global_actions %}
{#{% if easyadmin_action_is_enabled_for_list_view('new', _entity_config.name) %}
{# {% if easyadmin_action_is_enabled_for_list_view('new', _entity_config.name) %}
{% set _action = easyadmin_get_action_for_list_view('new', _entity_config.name) %} {% set _action = easyadmin_get_action_for_list_view('new', _entity_config.name) %}
{% block new_action %} {% block new_action %}
<div class="button-action"> <div class="button-action">
</a> </a>
</div> </div>
{% endblock new_action %} {% endblock new_action %}
{% endif %}#}
{% endif %} #}
{% endblock global_actions %} {% endblock global_actions %}


{% block batch_actions %} {% block batch_actions %}
{% block card_header %} {% block card_header %}


<h2 class="card-title text-lg "> <h2 class="card-title text-lg ">
<div class="btn-group">
{% set itemsPerPage = [10,20,30,50,100,200] %}
{% for itemPerPage in itemsPerPage %}
<a href="{{ path('easyadmin', _request_parameters|merge({ maxResults: itemPerPage, page : "1" })) }}"
class="btn btn-sm {{ paginator.maxPerPage == itemPerPage ? 'btn-outline-secondary' : 'btn-secondary'}}">{{ itemPerPage }}</a>
{% endfor %}

</div>
{% block paginator_nb_results %} {% block paginator_nb_results %}
{#{{ "list.title"|trans({'%label%' : _entity_config['label']|lower }) }}#}
{# {{ "list.title"|trans({'%label%' : _entity_config['label']|lower }) }} #}
{% if paginator.nbResultsTotal != paginator.nbResults %} {% if paginator.nbResultsTotal != paginator.nbResults %}
<span data-toggle="tooltip" title="{{ "list.nbResultsFiltered"|trans }}" <span data-toggle="tooltip" title="{{ "list.nbResultsFiltered"|trans }}"
class="badge badge-info">{{ paginator.nbResults }} <i class="badge badge-info">{{ paginator.nbResults }} <i
{# the empty string concatenation is needed when the primary key is an object (e.g. an Uuid object) #} {# the empty string concatenation is needed when the primary key is an object (e.g. an Uuid object) #}
{% set _item_id = '' ~ attribute(item, _entity_config.primary_key_field_name) %} {% set _item_id = '' ~ attribute(item, _entity_config.primary_key_field_name) %}
<tr data-id="{{ _item_id }}"> <tr data-id="{{ _item_id }}">

{% if _has_batch_actions %} {% if _has_batch_actions %}
<td><input type="checkbox" class="form-batch-checkbox" <td><input type="checkbox" class="form-batch-checkbox"
value="{{ _item_id }}"></td> value="{{ _item_id }}"></td>
{{ easyadmin_render_field_for_list_view(_entity_config.name, item, metadata) }} {{ easyadmin_render_field_for_list_view(_entity_config.name, item, metadata) }}
</a> </a>
{% else %} {% else %}
{# {% if metadatafieldName =="supplier" %}
{{ dump(metadata) }}
{% endif %} #}
{{ easyadmin_render_field_for_list_view(_entity_config.name, item, metadata) }} {{ easyadmin_render_field_for_list_view(_entity_config.name, item, metadata) }}
{% endif %} {% endif %}
</td> </td>
<script src="{{ asset('bundles/lcshop/js/backend/plugin/daterange/daterangepicker.js') }}"></script> <script src="{{ asset('bundles/lcshop/js/backend/plugin/daterange/daterangepicker.js') }}"></script>
<script src="{{ asset('bundles/lcshop/js/backend/plugin/datatables/jquery.highlight.js') }}"></script> <script src="{{ asset('bundles/lcshop/js/backend/plugin/datatables/jquery.highlight.js') }}"></script>
<script src="{{ asset('bundles/lcshop/js/backend/plugin/autocomplete/bootstrap-autocomplete.min.js') }}"></script> <script src="{{ asset('bundles/lcshop/js/backend/plugin/autocomplete/bootstrap-autocomplete.min.js') }}"></script>
{#<script src="{{ asset('bundles/lcshop/js/backend/plugin/datatables/responsive.bootstrap4.min.js') }}"></script>#}
{# <script src="{{ asset('bundles/lcshop/js/backend/plugin/datatables/responsive.bootstrap4.min.js') }}"></script> #}
{% endblock %} {% endblock %}


{% block script_javascript %} {% block script_javascript %}




<script type="text/javascript"> <script type="text/javascript">


$(document).ready(function () { $(document).ready(function () {
const toggles = document.querySelectorAll('.custom-switch input[type="checkbox"]'); const toggles = document.querySelectorAll('.custom-switch input[type="checkbox"]');
for (i = 0; i < toggles.length; i++) { for (i = 0; i < toggles.length; i++) {

+ 3
- 1
ShopBundle/Resources/views/backend/merchant/form.html.twig View File

<div v-show="currentSection == 'maintenance'" class="panel panel-default"> <div v-show="currentSection == 'maintenance'" class="panel panel-default">
{% include '@LcShop/backend/merchant/panel_maintenance.html.twig' %} {% include '@LcShop/backend/merchant/panel_maintenance.html.twig' %}
</div> </div>

<div v-show="currentSection == 'lunch'" class="panel panel-default">
{% include '@LcShop/backend/merchant/panel_lunch.html.twig' %}
</div>
</div> </div>


</div> </div>

+ 18
- 0
ShopBundle/Resources/views/backend/merchant/panel_lunch.html.twig View File

{% import '@LcShop/backend/default/block/macros.html.twig' as macros %}

<div class="row">
<div class="col-8">
{{ macros.card_start('Merchant.lunch','light') }}
{% if form.merchantConfigs['message-lunch-open'] is defined %}
<div class="col-12">
{{ form_row(form.merchantConfigs['message-lunch-open']) }}
</div>
{% endif %}
{% if form.merchantConfigs['message-lunch-closed'] is defined %}
<div class="col-12">
{{ form_row(form.merchantConfigs['message-lunch-closed']) }}
</div>
{% endif %}
{{ macros.card_end() }}
</div>
</div>

+ 11
- 0
ShopBundle/Resources/views/backend/order/show-cart.html.twig View File

{% import '@LcShop/backend/default/block/macros.html.twig' as macros %} {% import '@LcShop/backend/default/block/macros.html.twig' as macros %}
{% import '@LcShop/backend/order/macros.html.twig' as order_macros %} {% import '@LcShop/backend/order/macros.html.twig' as order_macros %}


{% block global_actions %}
{% if entity.user is not null %}
<button id="btn-ticket-write-to-user"
data-url="{{ path('easyadmin', {'entity': 'Ticket', 'action': 'new'}) }}"
data-user="{{ entity.user.id }}"
class="btn-sm btn-success"
type="button"><i class="fa fa-pen-alt"></i> {{ "action.ticket.writeToUser"|trans }}
</button>
{% endif %}
{% endblock %}

{% block main %} {% block main %}


<div class="lc-vue-js-container" id="lc-order-edit"> <div class="lc-vue-js-container" id="lc-order-edit">

+ 12
- 0
ShopBundle/Resources/views/backend/order/show-order.html.twig View File

{% import '@LcShop/backend/default/block/macros.html.twig' as macros %} {% import '@LcShop/backend/default/block/macros.html.twig' as macros %}
{% import '@LcShop/backend/order/macros.html.twig' as order_macros %} {% import '@LcShop/backend/order/macros.html.twig' as order_macros %}


{% block global_actions %}
{% if entity.user is not null %}
<button id="btn-ticket-write-to-user"
data-url="{{ path('easyadmin', {'entity': 'Ticket', 'action': 'new'}) }}"
data-user="{{ entity.user.id }}"
data-order="{{ entity.id }}"
class="btn-sm btn-success"
type="button"><i class="fa fa-pen-alt"></i> {{ "action.ticket.writeToUser"|trans }}
</button>
{% endif %}
{% endblock %}

{% block main %} {% block main %}


<div class="lc-vue-js-container" id="lc-order-edit"> <div class="lc-vue-js-container" id="lc-order-edit">

ShopBundle/Resources/views/backend/order/show.html.twig → ShopBundle/Resources/views/backend/order/show.html.twigTODELETE View File


+ 1
- 1
ShopBundle/Resources/views/backend/productfamily/form.html.twig View File

{% import '@LcShop/backend/productfamily/macros.html.twig' as product_family_macros %} {% import '@LcShop/backend/productfamily/macros.html.twig' as product_family_macros %}


{% set formValues = form.vars.value %} {% set formValues = form.vars.value %}

<div id="lc-product-family-edit"> <div id="lc-product-family-edit">
<div class="card card-light"> <div class="card card-light">
<div class="lc-vue-js-container card-header p-0 border-bottom-0"> <div class="lc-vue-js-container card-header p-0 border-bottom-0">
{% if formValues.activeProducts %}activeProducts: "{{ formValues.activeProducts }}",{% endif %} {% if formValues.activeProducts %}activeProducts: "{{ formValues.activeProducts }}",{% endif %}
{% if formValues.giftVoucherActive %}giftVoucherActive: "{{ formValues.giftVoucherActive }}",{% endif %} {% if formValues.giftVoucherActive %}giftVoucherActive: "{{ formValues.giftVoucherActive }}",{% endif %}
{% if formValues.productsQuantityAsTitle %}productsQuantityAsTitle: {{ formValues.productsQuantityAsTitle }},{% endif %} {% if formValues.productsQuantityAsTitle %}productsQuantityAsTitle: {{ formValues.productsQuantityAsTitle }},{% endif %}
{% if form.sections.vars.value %}section: {{ form.sections.vars.value[0] }},{% endif %}


}; };
multiplyingFactor = "{{ form.multiplyingFactor.vars.value }}" multiplyingFactor = "{{ form.multiplyingFactor.vars.value }}"

+ 23
- 4
ShopBundle/Resources/views/backend/productfamily/panel_general.html.twig View File

{% import '@LcShop/backend/default/block/macros.html.twig' as macros %} {% import '@LcShop/backend/default/block/macros.html.twig' as macros %}


<div class="row"> <div class="row">
{{ macros.startCard(8, 'ProductFamily.main','light') }}
<div class="col-12">
{{ macros.startCard(8, 'ProductFamily.status','light') }}
<div class="col-6">
{{ form_row(form.status) }} {{ form_row(form.status) }}
</div> </div>
<div class="col-12">
<div class="col-6">
<label>Status de vente</label>
{{ form_row(form.saleStatus) }} {{ form_row(form.saleStatus) }}
</div> </div>

<div class="col-12">
{{ form_label(form.sections) }}
{% for section in form.sections %}
<div class="form-check">
<label class="form-check-label" for="{{ section.vars.id }}">
<input v-model="section" type="radio" id="{{ section.vars.id }}" name="{{ section.vars.full_name }}" class="form-check-input" value="{{ section.vars.value }}" {{ section.vars.checked == true ? 'checked="checked"' : '' }}>
<span class="checkmark"></span>
{{ section.vars.label }}
</label>
</div>
{% endfor %}
{% do form.sections.setRendered %}
</div>
{{ macros.endCard() }}


{{ macros.startCard(8, 'ProductFamily.main','light') }}
<div class="col-12"> <div class="col-12">
{{ form_row(form.supplier) }} {{ form_row(form.supplier) }}
</div> </div>
<div class="col-12 product-categories"> <div class="col-12 product-categories">
{% for category in form.productCategories %} {% for category in form.productCategories %}


<div class="field {{ category.vars.disabled ? 'parent' }}">
<div class="field {{ category.vars.disabled ? 'parent' }}">
{{ form_row(category) }} {{ form_row(category) }}
</div> </div>



+ 6
- 6
ShopBundle/Resources/views/backend/ticket/list-fields/field_lastmessage_date.html.twig View File



{% set lastMessage = item.ticketMessages.last %} {% set lastMessage = item.ticketMessages.last %}
{% if lastMessage.answerByAdmin != true %}
<span class="badge badge-danger">
{% if lastMessage %}
{% if lastMessage.answerByAdmin != true %}
<span class="badge badge-danger">
New New
</span>
</span>
{% endif %}
{{ lastMessage.createdAt|date('d/m/Y H:i') }} par {{ lastMessage.createdBy }}
{% endif %} {% endif %}
{{ lastMessage.createdAt|date('d/m/Y H:i') }} par {{ lastMessage.createdBy }}

+ 38
- 0
ShopBundle/Resources/views/backend/ticket/modal/create.html.twig View File


{% embed "@LcShop/backend/default/block/embed_modal.twig" %}
{% trans_default_domain 'lcshop' %}

{% block id %}modal-new-ticket{% endblock %}
{% block title %}{{ "action.ticket.writeToUser"|trans }}{% endblock %}

{% block form_start %}
{{ form_start(form, {'attr': { 'id' : 'newTicket', 'action': path('easyadmin', {'entity' : 'Ticket', 'action': 'new'})}}) }}
{% form_theme form '@LcShop/backend/form/custom_modal_bootstrap_4.html.twig' %}
{% endblock %}

{% block content %}
<div class="col">
{{ form_row(form.user) }}
{{ form_row(form.subject) }}

{% if form.orderId.vars.value is not empty %}
<p>
<strong>Ce ticket concernera la commande #{{ form.orderId.vars.value }}</strong><br />
<i>Si vous ne le souhaitez pas, écrivez à l'utilisateur depuis l'onglet utilisateur</i>
</p>
{% endif %}
{{ form_rest(form) }}
</div>
{% endblock %}

{% block footer %}
{{ parent() }}
<button type="button" class="btn btn-primary btn-save" >{{ 'action.send'|trans }}</button>
{#{{ form_rest(form) }}#}
{% endblock %}

{% block form_end %}
{{ form_end(form) }}
{% endblock %}

{% endembed %}

+ 30
- 17
ShopBundle/Resources/views/backend/user/edit.html.twig View File

{% extends app.request.query.get('action') == 'edit' ? '@LcShop/backend/default/edit.html.twig' : '@LcShop/backend/default/new.html.twig' %}
{% extends app.request.query.get('action') == 'edit' ? '@LcShop/backend/default/edit.html.twig' : '@LcShop/backend/default/new.html.twig' %}
{% trans_default_domain 'lcshop' %} {% trans_default_domain 'lcshop' %}

{% block global_actions %}
<button id="btn-ticket-write-to-user"
data-url="{{ path('easyadmin', {'entity': 'Ticket', 'action': 'new'}) }}"
data-user="{{ entity.id }}"
class="btn-sm btn-success"
type="button"><i class="fa fa-pen-alt"></i> {{ "action.ticket.writeToUser"|trans }}</button>

{% endblock %}

{% block entity_form %} {% block entity_form %}
{% import '@LcShop/backend/default/block/macros.html.twig' as macros %} {% import '@LcShop/backend/default/block/macros.html.twig' as macros %}
{{ form_start(form) }} {{ form_start(form) }}
{% form_theme form '@LcShop/backend/form/custom_bootstrap_4.html.twig' %} {% form_theme form '@LcShop/backend/form/custom_bootstrap_4.html.twig' %}
<div class="row"> <div class="row">
<div class="col-7">
{{ macros.card_start() }}
<div class="col">
{% for field in form.children %}
{{ form_row(field) }}
{% endfor %}
</div>
{{ macros.card_end() }}
</div>
<div class="col-7">
{{ macros.card_start() }}
<div class="col">
{% for field in form.children %}
{{ form_row(field) }}
{% endfor %}
</div>
{{ macros.card_end() }}
</div>




<div class="col-5"> <div class="col-5">

<div class="row" id="user-addresses"> <div class="row" id="user-addresses">
{% for address in entity.addresses %}
{% if address.status >=0 %}
{% include '@LcShop/backend/user/block_useraddress.html.twig' %}
{% endif %}
{% endfor %}
{% for address in entity.addresses %}
{% if address.status >=0 %}
{% include '@LcShop/backend/user/block_useraddress.html.twig' %}
{% endif %}
{% endfor %}
</div> </div>
<button type="button" data-url="{{ path('easyadmin', {"action": 'editAddressUser', 'entity': 'User', 'id': entity.id, 'addressId': 'new'}) }}"
class="btn btn-primary btn-add-user-address" ><i class="fa fa-plus"></i> {{ 'action.address.add'|trans }}
<button type="button"
data-url="{{ path('easyadmin', {"action": 'editAddressUser', 'entity': 'User', 'id': entity.id, 'addressId': 'new'}) }}"
class="btn btn-primary btn-add-user-address"><i
class="fa fa-plus"></i> {{ 'action.address.add'|trans }}
</button> </button>


</div> </div>

+ 14
- 4
ShopBundle/Resources/views/backend/usermerchant/show.html.twig View File

{% extends '@LcShop/backend/default/show.html.twig' %} {% extends '@LcShop/backend/default/show.html.twig' %}


{% trans_default_domain 'lcshop' %} {% trans_default_domain 'lcshop' %}

{% block global_actions %}
<button id="btn-ticket-write-to-user"
data-url="{{ path('easyadmin', {'entity': 'Ticket', 'action': 'new'}) }}"
data-user="{{ entity.user.id }}"
class="btn-sm btn-success"
type="button"><i class="fa fa-pen-alt"></i> {{ "action.ticket.writeToUser"|trans }}</button>
{% endblock %}

{% block main %} {% block main %}


<div class="row"> <div class="row">
<td class="sorted">{{ creditHistory.id }}</td> <td class="sorted">{{ creditHistory.id }}</td>
<td class="association">{{ creditHistory.type }}</td> <td class="association">{{ creditHistory.type }}</td>
<td class="">{{ creditHistory.amountInherited }} €</td> <td class="">{{ creditHistory.amountInherited }} €</td>
<td class="">{{ creditHistory.meanPaymentInherited }}</td>
<td class="">{{ creditHistory.meanPaymentInherited }}</td>
<td class="">{{ creditHistory.paidAtInherited |date('d-m-y') }}</td> <td class="">{{ creditHistory.paidAtInherited |date('d-m-y') }}</td>
<td class="">{{ creditHistory.referenceInherited }}</td>
<td class="">{{ creditHistory.commentInherited }}</td>
<td class="">{{ creditHistory.referenceInherited }}</td>
<td class="">{{ creditHistory.commentInherited }}</td>
</tr> </tr>


{% else %} {% else %}


{% block head_stylesheets %} {% block head_stylesheets %}
{{ parent() }} {{ parent() }}
<link rel="stylesheet" href="{{ asset('bundles/lcshop/css/backend/adminlte/plugins/datatables/fixedHeader.dataTables.min.css') }}">
<link rel="stylesheet"
href="{{ asset('bundles/lcshop/css/backend/adminlte/plugins/datatables/fixedHeader.dataTables.min.css') }}">
<link rel="stylesheet" <link rel="stylesheet"
href="{{ asset('bundles/lcshop/css/backend/adminlte/plugins/datatables/dataTables.bootstrap4.min.css') }}"> href="{{ asset('bundles/lcshop/css/backend/adminlte/plugins/datatables/dataTables.bootstrap4.min.css') }}">
{% endblock %} {% endblock %}

+ 16
- 6
ShopBundle/Services/Order/OrderUtils.php View File

use Lc\ShopBundle\Context\PriceUtilsInterface; use Lc\ShopBundle\Context\PriceUtilsInterface;
use Lc\ShopBundle\Context\ProductFamilyUtilsInterface; use Lc\ShopBundle\Context\ProductFamilyUtilsInterface;
use Lc\ShopBundle\Context\ReductionCreditInterface; use Lc\ShopBundle\Context\ReductionCreditInterface;
use Lc\ShopBundle\Context\SectionInterface;
use Lc\ShopBundle\Context\SectionUtilsInterface;
use Lc\ShopBundle\Context\UserUtilsInterface; use Lc\ShopBundle\Context\UserUtilsInterface;
use Lc\ShopBundle\Model\ProductFamily; use Lc\ShopBundle\Model\ProductFamily;
use Lc\ShopBundle\Services\CreditUtils; use Lc\ShopBundle\Services\CreditUtils;
use Lc\ShopBundle\Services\DocumentUtils; use Lc\ShopBundle\Services\DocumentUtils;
use Lc\ShopBundle\Services\UserUtils; use Lc\ShopBundle\Services\UserUtils;
use Lc\ShopBundle\Services\Utils; use Lc\ShopBundle\Services\Utils;
use Lc\ShopBundle\Services\UtilsManager;
use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\RouterInterface;


use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
protected $utils; protected $utils;
protected $creditUtils; protected $creditUtils;
protected $router; protected $router;
protected $sectionUtils ;


public function __construct(EntityManagerInterface $em, Security $security, RouterInterface $router, UserUtilsInterface $userUtils, public function __construct(EntityManagerInterface $em, Security $security, RouterInterface $router, UserUtilsInterface $userUtils,
MerchantUtilsInterface $merchantUtils, PriceUtilsInterface $priceUtils, ProductFamilyUtilsInterface $productFamilyUtils, MerchantUtilsInterface $merchantUtils, PriceUtilsInterface $priceUtils, ProductFamilyUtilsInterface $productFamilyUtils,
DocumentUtils $documentUtils, Utils $utils, CreditUtils $creditUtils)
DocumentUtils $documentUtils, Utils $utils, CreditUtils $creditUtils, SectionUtilsInterface $sectionUtils)
{ {
$this->em = $em; $this->em = $em;
$this->security = $security; $this->security = $security;
$this->utils = $utils; $this->utils = $utils;
$this->creditUtils = $creditUtils; $this->creditUtils = $creditUtils;
$this->router = $router; $this->router = $router;
$this->sectionUtils = $sectionUtils ;
} }




public function createOrderShop($params) public function createOrderShop($params)
{ {
//TODO vérifier que l'utilisateur n'a pas déjà une commande en cours //TODO vérifier que l'utilisateur n'a pas déjà une commande en cours
throw new \ErrorException('La commande doit être liée à un merchant.'); throw new \ErrorException('La commande doit être liée à un merchant.');
} }


// pour le moment, à la création, on lie simplement la commande à la section "Marché"
$section = $this->sectionUtils->getSectionMarket() ;
if($section) {
$orderShop->setSection($section) ;
}
else {
throw new \ErrorException('La commande doit être liée à une section.');
}

$orderShop = $this->changeOrderStatus('cart', $orderShop); $orderShop = $this->changeOrderStatus('cart', $orderShop);


return $orderShop; return $orderShop;


public function addOrderProduct($orderShop, $orderProductAdd, $persist = true) public function addOrderProduct($orderShop, $orderProductAdd, $persist = true)
{ {

$return = false; $return = false;



if (!$orderShop) { if (!$orderShop) {
$user = $this->security->getUser(); $user = $this->security->getUser();
$visitor = $this->userUtils->getVisitorCurrent(); $visitor = $this->userUtils->getVisitorCurrent();
$orderShop = $this->createOrderShop([ $orderShop = $this->createOrderShop([
'user' => $user, 'user' => $user,
'visitor' => $visitor, 'visitor' => $visitor,
'merchant' => $this->merchantUtils->getMerchantCurrent()
'merchant' => $this->merchantUtils->getMerchantCurrent(),
]); ]);
} }



+ 3
- 2
ShopBundle/Services/Order/OrderUtilsCartTrait.php View File



namespace Lc\ShopBundle\Services\Order; namespace Lc\ShopBundle\Services\Order;



use Lc\ShopBundle\Context\OrderShopInterface; use Lc\ShopBundle\Context\OrderShopInterface;
use Lc\ShopBundle\Model\OrderStatus; use Lc\ShopBundle\Model\OrderStatus;


} }


if($createIfNotExist && !$orderShop) { if($createIfNotExist && !$orderShop) {
$merchant = $this->merchantUtils->getMerchantCurrent() ;

$orderShop = $this->createOrderShop([ $orderShop = $this->createOrderShop([
'user' => $user, 'user' => $user,
'visitor' => $visitor, 'visitor' => $visitor,
'merchant' => $this->merchantUtils->getMerchantCurrent()
'merchant' => $merchant,
]); ]);
} }



+ 19
- 2
ShopBundle/Services/Order/OrderUtilsStockTrait.php View File

} }


$allCategoriesSalesOff = true; $allCategoriesSalesOff = true;
$unavailableSpecificDay = false;

foreach ($product->getProductFamily()->getProductCategories() as $category){ foreach ($product->getProductFamily()->getProductCategories() as $category){
if($category->getParent()) { if($category->getParent()) {
if($category->getSaleStatus() && $category->getParent()->getSaleStatus()) if($category->getSaleStatus() && $category->getParent()->getSaleStatus())
$allCategoriesSalesOff = false; $allCategoriesSalesOff = false;
} }
else { else {
if($category->getSaleStatus()) $allCategoriesSalesOff = false;
if($category->getSaleStatus()) {
$allCategoriesSalesOff = false;
}
} }

// specific day
$displaySpecificDay = $category->getDisplaySpecificDay() ;
if($displaySpecificDay && $displaySpecificDay != date('N')) {
$unavailableSpecificDay = true;
}
}

if($allCategoriesSalesOff) {
return false;
}

if($unavailableSpecificDay) {
return false;
} }
if($allCategoriesSalesOff) return false;


return true ; return true ;
} }

+ 37
- 0
ShopBundle/Services/SectionUtils.php View File

<?php

namespace Lc\ShopBundle\Services ;

use Doctrine\ORM\EntityManagerInterface;
use Http\Discovery\Exception\NotFoundException;
use Lc\ShopBundle\Context\MerchantUtilsInterface;
use Lc\ShopBundle\Context\SectionInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

class SectionUtils
{
protected $em ;
protected $merchantUtils ;
protected $sectionRepository ;

public function __construct(EntityManagerInterface $em, MerchantUtilsInterface $merchantUtils)
{
$this->em = $em ;
$this->sectionRepository = $this->em->getRepository($this->em->getClassMetadata(SectionInterface::class)->getName()) ;
$this->merchantUtils = $merchantUtils ;
}

public function getSection($devAlias)
{
$section = $this->sectionRepository->findOneBy([
'merchant' => $this->merchantUtils->getMerchantCurrent(),
'devAlias' => $devAlias
]) ;

if(!$section) {
throw new NotFoundException('La section '.$devAlias.' est introuvable') ;
}

return $section ;
}
}

+ 23
- 10
ShopBundle/Services/TicketUtils.php View File

$ticketMessage->setStatus(1) ; $ticketMessage->setStatus(1) ;
$ticketMessage->setTicket($ticket) ; $ticketMessage->setTicket($ticket) ;
$ticketMessage->setMessage($params['message']) ; $ticketMessage->setMessage($params['message']) ;
if(isset($params['createByAdmin']) && $params['createByAdmin'])$ticketMessage->setAnswerByAdmin(true);
$this->em->persist($ticketMessage); $this->em->persist($ticketMessage);


$this->em->flush() ; $this->em->flush() ;


// envoi email au client
$this->mailUtils->send([
MailUtils::SUBJECT => 'Nouvelle demande',
MailUtils::TO_EMAIL => $email,
MailUtils::CONTENT_TEMPLATE => 'mail/ticket-new',
MailUtils::CONTENT_DATA => [
'firstname' => $firstname,
'ticket' => $ticket
],
]) ;
if(isset($params['createByAdmin']) && $params['createByAdmin']) {
// envoi email au client
$this->mailUtils->send([
MailUtils::SUBJECT => 'Vous avez reçu un nouveau message',
MailUtils::TO_EMAIL => $email,
MailUtils::CONTENT_TEMPLATE => 'mail/ticket-new-by-admin',
MailUtils::CONTENT_DATA => [
'firstname' => $firstname,
'ticket' => $ticket
],
]);
}else{
$this->mailUtils->send([
MailUtils::SUBJECT => 'Nouvelle demande',
MailUtils::TO_EMAIL => $email,
MailUtils::CONTENT_TEMPLATE => 'mail/ticket-new',
MailUtils::CONTENT_DATA => [
'firstname' => $firstname,
'ticket' => $ticket
],
]);
}




$this->notifyAdmin($ticket, $ticketMessage); $this->notifyAdmin($ticket, $ticketMessage);

+ 10
- 1
ShopBundle/Services/UtilsManager.php View File

use Lc\ShopBundle\Context\OrderUtilsInterface; use Lc\ShopBundle\Context\OrderUtilsInterface;
use Lc\ShopBundle\Context\PriceUtilsInterface; use Lc\ShopBundle\Context\PriceUtilsInterface;
use Lc\ShopBundle\Context\ProductFamilyUtilsInterface; use Lc\ShopBundle\Context\ProductFamilyUtilsInterface;
use Lc\ShopBundle\Context\SectionUtilsInterface;
use Lc\ShopBundle\Context\Services\StatisticsUtilsInterface; use Lc\ShopBundle\Context\Services\StatisticsUtilsInterface;
use Lc\ShopBundle\Context\UserUtilsInterface; use Lc\ShopBundle\Context\UserUtilsInterface;
use League\Flysystem\Util; use League\Flysystem\Util;
protected $ticketUtils ; protected $ticketUtils ;
protected $statisticsUtils; protected $statisticsUtils;
protected $pointLocationUtils ; protected $pointLocationUtils ;
protected $sectionUtils ;


public function __construct( public function __construct(
Utils $utils, Utils $utils,
MailUtils $mailUtils, MailUtils $mailUtils,
TicketUtils $ticketUtils, TicketUtils $ticketUtils,
PointLocationUtils $pointLocationUtils, PointLocationUtils $pointLocationUtils,
UtilsProcess $utilsProcess
UtilsProcess $utilsProcess,
SectionUtilsInterface $sectionUtils
) )
{ {
$this->utils = $utils ; $this->utils = $utils ;
$this->ticketUtils = $ticketUtils ; $this->ticketUtils = $ticketUtils ;
$this->pointLocationUtils = $pointLocationUtils ; $this->pointLocationUtils = $pointLocationUtils ;
$this->utilsProcess = $utilsProcess ; $this->utilsProcess = $utilsProcess ;
$this->sectionUtils = $sectionUtils ;
} }


public function getUtils(): Utils public function getUtils(): Utils
return $this->utilsProcess ; return $this->utilsProcess ;
} }


public function getSectionUtils(): SectionUtilsInterface
{
return $this->sectionUtils ;
}

} }

Loading…
Cancel
Save