@@ -342,7 +342,7 @@ abstract class AbstractAdminController extends EaAbstractCrudController | |||
} | |||
$newEntity = $entityComponent->duplicateEntity($context->getEntity()->getInstance()); | |||
$em->create($newEntity); | |||
$em->create($newEntity, false); | |||
$em->flush(); | |||
$url = $this->get(AdminUrlGenerator::class) |
@@ -8,6 +8,7 @@ use EasyCorp\Bundle\EasyAdminBundle\Field\FormField; | |||
use EasyCorp\Bundle\EasyAdminBundle\Field\IntegerField; | |||
use EasyCorp\Bundle\EasyAdminBundle\Field\TextareaField; | |||
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField; | |||
use Lc\CaracoleBundle\Field\AssociationField; | |||
use Lc\SovBundle\Field\CKEditorField; | |||
use Lc\SovBundle\Field\CollectionField; | |||
use Lc\SovBundle\Field\ImageManagerField; | |||
@@ -55,6 +56,8 @@ abstract class AbstractFieldDefinition | |||
'status' => StatusField::new('status')->setSortable(true), | |||
'createdAt' => DateTimeField::new('createdAt')->setSortable(true), | |||
'updatedAt' => DateTimeField::new('updatedAt')->setSortable(true), | |||
'createdBy' => AssociationField::new('createdBy'), | |||
'updatedBy' => AssociationField::new('updatedBy') | |||
]; | |||
} | |||
@@ -146,3 +146,9 @@ table.fixedHeader-floating { | |||
} | |||
.badge.stripped{background-image: url('../img/stripped.png');} | |||
.ui-sortable-helper { | |||
display: table; | |||
} | |||
.lc-draggable{width: 100%;} | |||
.sortable{width: 100%} |
@@ -6,7 +6,7 @@ export class SovPrices { | |||
} | |||
static getPriceWithTax(priceWithoutTax, taxRate) { | |||
return parseFloat(parseFloat(priceWithoutTax) * ((taxRate/100) + 1)).toFixed(2); | |||
return parseFloat(parseFloat(priceWithoutTax) * ((taxRate/100) + 1)).toFixed(4); | |||
} | |||
static getMargin(price, buyingPrice){ | |||
@@ -24,11 +24,11 @@ export class SovPrices { | |||
static applyReductionAmount(price, amount) | |||
{ | |||
return parseFloat(price - amount).toFixed(2); | |||
return parseFloat(price - amount).toFixed(4); | |||
} | |||
static applyPercent(price, percentage) | |||
{ | |||
return parseFloat(price * (percentage / 100 + 1)).toFixed(2); | |||
return parseFloat(price * (percentage / 100 + 1)).toFixed(4); | |||
} | |||
} |
@@ -19,12 +19,12 @@ export class SovWidgets { | |||
options.width = 'auto' | |||
} | |||
options.placeholder = ""; | |||
// @TODO : génère une erreur | |||
/*if ($select.find('option[value=""]')) { | |||
if ($select.find('option[value=""]').length) { | |||
options.placeholder = $select.find('option[value=""]').html() | |||
}*/ | |||
options.placeholder = ""; | |||
} | |||
var myselect = $select.select2(options); | |||
@@ -119,6 +119,7 @@ entity: | |||
label_plurial: Blocs | |||
default: | |||
fields: | |||
placeholder: Sélectionner une valeur | |||
id: Id | |||
confirmDelete: Confirmer la suppression | |||
createdAt: Créé le |