Browse Source

Merge duplication supplier & productOrigin

feature/export_comptable
Fab 4 years ago
parent
commit
0802eff415
8 changed files with 124 additions and 61 deletions
  1. +9
    -26
      ShopBundle/Controller/Backend/ProductFamilyController.php
  2. +1
    -0
      ShopBundle/Form/Backend/ProductFamily/ProductType.php
  3. +21
    -6
      ShopBundle/Model/Product.php
  4. +36
    -4
      ShopBundle/Model/ProductFamily.php
  5. +3
    -1
      ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js
  6. +1
    -1
      ShopBundle/Resources/views/backend/productfamily/macros.html.twig
  7. +5
    -2
      ShopBundle/Resources/views/backend/productfamily/panel_products.html.twig
  8. +48
    -21
      ShopBundle/Services/ProductFamilyUtils.php

+ 9
- 26
ShopBundle/Controller/Backend/ProductFamilyController.php View File

use Lc\ShopBundle\Context\OrderShopInterface; use Lc\ShopBundle\Context\OrderShopInterface;
use Lc\ShopBundle\Context\ProductCategoryInterface; use Lc\ShopBundle\Context\ProductCategoryInterface;
use Lc\ShopBundle\Context\ProductFamilyInterface; use Lc\ShopBundle\Context\ProductFamilyInterface;
use Lc\ShopBundle\Context\ProductInterface;
use Lc\ShopBundle\Context\ReductionCatalogInterface; use Lc\ShopBundle\Context\ReductionCatalogInterface;
use Lc\ShopBundle\Context\TaxRateInterface; use Lc\ShopBundle\Context\TaxRateInterface;
use Lc\ShopBundle\Form\Backend\Common\AbstractEditPositionType; use Lc\ShopBundle\Form\Backend\Common\AbstractEditPositionType;
$this->em->flush(); $this->em->flush();
} }




protected function editAction() protected function editAction()
{ {


$deleteForm = $this->createDeleteForm($this->entity['name'], $id); $deleteForm = $this->createDeleteForm($this->entity['name'], $id);


$sortableProductsField = array(); $sortableProductsField = array();

foreach ($editForm->get('products')->getData() as $k => $product) { foreach ($editForm->get('products')->getData() as $k => $product) {
$sortableProductsField[$product->getPosition()] = $k;
if($product->getOriginProduct() == false) {
$sortableProductsField[$product->getPosition()] = $k;
}else{
$sortableProductsField[-1] = $k;
}


}


}
ksort($sortableProductsField); ksort($sortableProductsField);


$editForm->handleRequest($this->request); $editForm->handleRequest($this->request);
'entity' => $entity, 'entity' => $entity,
'categories' => $categories, 'categories' => $categories,
'sortableProductsField' => array(), 'sortableProductsField' => array(),
'totalProductOrdered' => array()
'totalProductOrdered' => array('total'=>0)
]; ];


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


/*public function duplicateAction()
{
$id = $this->request->query->get('id');
$refererUrl = $this->request->query->get('referer', '');

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

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

$newProductFamily = clone $entity;
if ($easyadmin['entity']['name'] == "ProductFamily") {

}

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

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




//hack utilisé pour filter sur les catégories lors du tri des produits par sous cat //hack utilisé pour filter sur les catégories lors du tri des produits par sous cat
//A améliorer à l'occas //A améliorer à l'occas

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

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


//dump($builder);


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

+ 21
- 6
ShopBundle/Model/Product.php View File

*/ */
protected $title; protected $title;


/**
* @ORM\Column(type="boolean", nullable=true)
*/
protected $originProduct;


public function __construct() public function __construct()
{ {


public function __toString() public function __toString()
{ {
$title = $this->getProductFamily()->getTitle() ;
$title = $this->getProductFamily()->getTitle();


if($this->getTitle() && strlen($this->getTitle())) {
$title .= ' - '. $this->getTitle() ;
if ($this->getTitle() && strlen($this->getTitle())) {
$title .= ' - ' . $this->getTitle();
} }


return $title ;
return $title;
} }


public function getBuyingPriceInherited() public function getBuyingPriceInherited()
{ {
if ($this->getQuantity()) { if ($this->getQuantity()) {
return $this->getQuantity(); return $this->getQuantity();
}
else {
} else {
return $this->getProductFamily()->getQuantity(); return $this->getProductFamily()->getQuantity();
} }
} }


return $this; return $this;
} }

public function getOriginProduct(): ?bool
{
return $this->originProduct;
}

public function setOriginProduct(?bool $originProduct): self
{
$this->originProduct = $originProduct;

return $this;
}
} }

+ 36
- 4
ShopBundle/Model/ProductFamily.php View File



case self::BEHAVIOR_COUNT_STOCK_BY_PRODUCT : case self::BEHAVIOR_COUNT_STOCK_BY_PRODUCT :


foreach($this->getProducts() as $product) {
foreach($this->getProductsOnline() as $product) {
$availableQuantity += $product->getAvailableQuantityInherited() ; $availableQuantity += $product->getAvailableQuantityInherited() ;
} }
break ; break ;
$productsOnlineArray = new ArrayCollection() ; $productsOnlineArray = new ArrayCollection() ;


foreach($products as $product) { foreach($products as $product) {
if($product->getStatus() == 1) {
if($product->getStatus() == 1 && $product->getOriginProduct() !=true) {
$productsOnlineArray[] = $product ; $productsOnlineArray[] = $product ;
} }
} }
{ {
if ($this->getActiveProducts()) { if ($this->getActiveProducts()) {
$arrayCountProducts = []; $arrayCountProducts = [];
$products = $this->getProducts();
$products = $this->getProductsOnline();


foreach ($products as $product) { foreach ($products as $product) {
$titleProduct = $product->getTitleInherited(); $titleProduct = $product->getTitleInherited();
public function getProductsGroupByTitle() public function getProductsGroupByTitle()
{ {
$arrayProductsGroupByTitle = []; $arrayProductsGroupByTitle = [];
$products = $this->getProducts();
$products = $this->getProductsOnline();


foreach ($products as $product) { foreach ($products as $product) {
if($product->getStatus() == 1) { if($product->getStatus() == 1) {


return $arrayProductsGroupByTitle; return $arrayProductsGroupByTitle;
} }

public function getOriginProduct()
{
$products = $this->getProducts() ;

foreach($products as $product) {
if($product->getOriginProduct()) {
return $product ;
}
}
}

public function getOriginProductOnline()
{
$originProduct = $this->getOriginProduct() ;

if($originProduct->getStatus()==1){
return $originProduct;
}else{
return false;
}
}

public function hasOneProductOnline()
{
if( ($this->getActiveProducts() && count($this->getProductsOnline()) > 0)
|| (!$this->getActiveProducts() && $this->getOriginProduct())){
return true ;
}

return false ;
}
} }

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

title: null, title: null,
position: 0, position: 0,
status:1, status:1,
originProduct: false,
fieldToUpdate: ['title', 'unit', 'quantity', 'price'], fieldToUpdate: ['title', 'unit', 'quantity', 'price'],
price: null, price: null,
priceWithTax: null, priceWithTax: null,
}, },
deleteProductForm: function () { deleteProductForm: function () {
if (confirm('Êtes-vous sur de cette action ?')) { if (confirm('Êtes-vous sur de cette action ?')) {
Vue.delete(this.$parent.formProducts, this.keyForm);
this.status = -1;
//Vue.delete(this.$parent.formProducts, this.keyForm);
this.$nextTick(function () { this.$nextTick(function () {
this.$parent.updateSortableProducts(true); this.$parent.updateSortableProducts(true);
}); });

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



{% macro product_row(product, totalProductOrdered) %} {% macro product_row(product, totalProductOrdered) %}


<tr class="lc-draggable">
<tr class="lc-draggable" v-show="originProduct != true && status >= 0 ">
<td> <td>
{% if product.vars.value is not null %} {% if product.vars.value is not null %}
#{{ product.vars.value.id }} #{{ product.vars.value.id }}

+ 5
- 2
ShopBundle/Resources/views/backend/productfamily/panel_products.html.twig View File

</th> </th>


<th colspan="3" class="price"> <th colspan="3" class="price">
{# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'">#}
{# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'">#}
PV HT PV HT
</th> </th>
<th colspan="3" class="price main-info"> <th colspan="3" class="price main-info">
</th> </th>


<th colspan="3" class="price"> <th colspan="3" class="price">
{# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'">#}
{# v-show="getBehaviorPrice() =='{{ constant('Lc\\ShopBundle\\Model\\ProductFamily::BEHAVIOR_PRICE_BY_PIECE') }}'">#}
${productFamily.price} ${productFamily.price}
</th> </th>
<th colspan="3" class="price main-info"> <th colspan="3" class="price main-info">
{% for keyForm,i in sortableProductsField %} {% for keyForm,i in sortableProductsField %}
{% set product = form.products[i] %} {% set product = form.products[i] %}


{#{% if product.vars.value.status >= 0 and (product.vars.value.originProduct is null or product.vars.value.originProduct == false) %}#}
window.productForm[{{ keyForm }}] = { window.productForm[{{ keyForm }}] = {
{% if product.vars.value.originProduct is defined %}originProduct: parseInt({{ product.vars.value.originProduct }}),{% endif %}
{% if product.vars.value.status is defined %}status: parseInt({{ product.vars.value.status }}),{% endif %} {% if product.vars.value.status is defined %}status: parseInt({{ product.vars.value.status }}),{% endif %}
{% if product.vars.value.position %}position: "{{ product.vars.value.position }}",{% endif %} {% if product.vars.value.position %}position: "{{ product.vars.value.position }}",{% endif %}
{% if product.vars.value.title %}title: "{{ product.vars.value.title }}",{% endif %} {% if product.vars.value.title %}title: "{{ product.vars.value.title }}",{% endif %}
{#{% if product.vars.value.expirationDate %}expirationDate: "{{ product.vars.value.expirationDate|date('d/m/Y') }}"{% endif %}#} {#{% if product.vars.value.expirationDate %}expirationDate: "{{ product.vars.value.expirationDate|date('d/m/Y') }}"{% endif %}#}
}; };
window.formProductTemplate[{{ keyForm }}] = '{{ product_family_macros.product_row(product, totalProductOrdered[product.vars.value.id])|replace({"\n":' ', "\r":' ', "'" : "\\'"})|raw }}'; window.formProductTemplate[{{ keyForm }}] = '{{ product_family_macros.product_row(product, totalProductOrdered[product.vars.value.id])|replace({"\n":' ', "\r":' ', "'" : "\\'"})|raw }}';
{#{% endif %}#}
{% endfor %} {% endfor %}


</script> </script>

+ 48
- 21
ShopBundle/Services/ProductFamilyUtils.php View File



private function getCheapestOrMostExpensiveProduct($productFamily, $comparisonFunction, $returnSelfIfNotActiveProducts) private function getCheapestOrMostExpensiveProduct($productFamily, $comparisonFunction, $returnSelfIfNotActiveProducts)
{ {
$products = $productFamily->getProductsOnline()->getValues() ;
if (count($products) > 0) {
usort($products, $comparisonFunction);
return $products[0];
if($productFamily->getActiveProducts()) {
$products = $productFamily->getProductsOnline()->getValues();
if (count($products) > 0) {
usort($products, $comparisonFunction);
return $products[0];
}
}else{
return $productFamily->getOriginProduct();
} }
if ($returnSelfIfNotActiveProducts) { if ($returnSelfIfNotActiveProducts) {
return $productFamily; return $productFamily;


protected function processProducts($entity, $clone = false) protected function processProducts($entity, $clone = false)
{ {
//si il existe un et un seul produit pour ce product family n'ajoute rien supprime rien
if (count($entity->getProducts()) == 0) {
$product = new Product();
$product->setProductFamily($entity);
$this->em->persist($product);
$entity->addProduct($product);
} else {
if($clone) {
foreach ($entity->getProducts() as $i => $product) { foreach ($entity->getProducts() as $i => $product) {
if ($clone) {
$newProduct = clone $product;
$newProduct->setProductFamily($entity);
$this->em->persist($newProduct);
$entity->addProduct($newProduct);
} else {
$product->setProductFamily($entity);
$this->em->persist($product);
$entity->addProduct($product);
}
$newProduct = clone $product;
$newProduct->setProductFamily($entity);
$this->em->persist($newProduct);
$entity->addProduct($newProduct);
}
}else {
//Récupère le product origin
$originProducts = $this->em->getRepository(ProductInterface::class)->findBy(array(
'productFamily' => $entity->getId(),
'originProduct' => true
));


if (count($originProducts) > 1) {
throw new \ErrorException('Plusieurs OriginProduct pour un même produit... Contacter fab');

// Case Nouveau product family
} else if (count($originProducts) == 0) {
$originProduct = new Product();
$originProduct->setProductFamily($entity);
$originProduct->setOriginProduct(true);
$entity->addProduct($originProduct);
} else {
$originProduct = $originProducts[0];
}

if ($entity->getActiveProducts()) {
$originProduct->setStatus(-1);
} else {
$originProduct->setStatus(1);
}

//Enregistrement
$entity->addProduct($originProduct);

foreach ($entity->getProducts() as $product) {
$product->setProductFamily($entity);
$this->em->persist($product);
$entity->addProduct($product);
} }
} }



Loading…
Cancel
Save