Browse Source

Connexion via prestashop

feature/export_comptable
Fab 4 years ago
parent
commit
5bcaf9a68e
4 changed files with 6 additions and 8 deletions
  1. +1
    -1
      ShopBundle/Model/Product.php
  2. +0
    -5
      ShopBundle/Resources/public/css/backend/custom.css
  3. +1
    -1
      ShopBundle/Resources/public/sass/backend/custom.scss
  4. +4
    -1
      ShopBundle/Services/MerchantUtils.php

+ 1
- 1
ShopBundle/Model/Product.php View File

protected $updatedBy; protected $updatedBy;


/** /**
* @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\ProductFamilyInterface", inversedBy="products")
* @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\ProductFamilyInterface", inversedBy="products", cascade={"persist"})
* @ORM\JoinColumn(nullable=false) * @ORM\JoinColumn(nullable=false)
*/ */
protected $productFamily; protected $productFamily;

+ 0
- 5
ShopBundle/Resources/public/css/backend/custom.css View File

position: relative; position: relative;
} }


/* line 66, ../../sass/backend/custom.scss */
.table-filters-line th input {
width: 350px;
}

/* line 67, ../../sass/backend/custom.scss */ /* line 67, ../../sass/backend/custom.scss */
#list_filter_id { #list_filter_id {
width: 60px; width: 60px;

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



.lc-table-list thead a{color: #212529} .lc-table-list thead a{color: #212529}
.table-filters-line th {font-weight: 400; position: relative;} .table-filters-line th {font-weight: 400; position: relative;}
.table-filters-line th input{width: 350px;}
.table-filters-line th input{}
#list_filter_id{width: 60px;} #list_filter_id{width: 60px;}
.lc-table-list .date-range{width: 130px;} .lc-table-list .date-range{width: 130px;}



+ 4
- 1
ShopBundle/Services/MerchantUtils.php View File

$merchant = isset($params['merchant']) ? $params['merchant'] : null ; $merchant = isset($params['merchant']) ? $params['merchant'] : null ;
$active = isset($params['active']) ? $params['active'] : true ; $active = isset($params['active']) ? $params['active'] : true ;
$flush = isset($params['flush']) ? $params['flush'] : true ; $flush = isset($params['flush']) ? $params['flush'] : true ;
$persist = isset($params['persist']) ? $params['persist'] : true ;


$userMerchant = $userMerchantRepository->findOneBy([ $userMerchant = $userMerchantRepository->findOneBy([
'user' => $user, 'user' => $user,
$userMerchant->setCredit($params['credit']) ; $userMerchant->setCredit($params['credit']) ;
} }


$this->em->persist($userMerchant);
if($persist) {
$this->em->persist($userMerchant);
}


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

Loading…
Cancel
Save